Skip to content

L
lxc
Unverified Commit 69556eaf by Stéphane Graber Committed by GitHub
Options

Merge pull request #2187 from itoffshore/alpine

fix download template for /tmp as tmpfs or noexec
parents c8a5adcd edb5452c
Showing with 8 additions and 3 deletions
templates/lxc-download.in
...@@ -46,6 +46,7 @@ DOWNLOAD_URL= ...@@ -46,6 +46,7 @@ DOWNLOAD_URL=
DOWNLOAD_USE_CACHE="false" DOWNLOAD_USE_CACHE="false"
DOWNLOAD_VALIDATE="true" DOWNLOAD_VALIDATE="true"
DOWNLOAD_VARIANT="default" DOWNLOAD_VARIANT="default"
DOWNLOAD_TEMP=
LXC_MAPPED_GID= LXC_MAPPED_GID=
LXC_MAPPED_UID= LXC_MAPPED_UID=
...@@ -311,11 +312,15 @@ fi ...@@ -311,11 +312,15 @@ fi
# Trap all exit signals # Trap all exit signals
trap cleanup EXIT HUP INT TERM trap cleanup EXIT HUP INT TERM
# /tmp may be mounted in tmpfs or noexec
if mountpoint -q /tmp; then
DOWNLOAD_TEMP="${LXC_PATH}"
fi
if ! command -V mktemp >/dev/null 2>&1; then if ! command -V mktemp >/dev/null 2>&1; then
DOWNLOAD_TEMP=/tmp/lxc-download.$$ DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$"
mkdir -p "${DOWNLOAD_TEMP}"
else else
DOWNLOAD_TEMP=$(mktemp -d) DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
fi fi
# Simply list images # Simply list images
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment