Skip to content

Commit

Permalink
fix download template for /tmp as tmpfs or noexec
Browse files Browse the repository at this point in the history
* prepend $LXC_PATH to $DOWNLOAD_TEMP on systems with /tmp mounted
  securely as a small tmpfs / noexec

* gpg_setup() creates $DOWNLOAD_TEMP so remove superflous mkdir

* fixes #516

Signed-off-by: Stuart Cardall <developer@it-offshore.co.uk>
  • Loading branch information
itoffshore authored and Christian Brauner committed Aug 23, 2018
1 parent 39a30bc commit 1f3ae60
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions templates/lxc-download.in
Expand Up @@ -46,6 +46,7 @@ DOWNLOAD_URL=
DOWNLOAD_USE_CACHE="false"
DOWNLOAD_VALIDATE="true"
DOWNLOAD_VARIANT="default"
DOWNLOAD_TEMP=

LXC_MAPPED_GID=
LXC_MAPPED_UID=
Expand Down Expand Up @@ -311,11 +312,15 @@ fi
# Trap all exit signals
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
DOWNLOAD_TEMP=/tmp/lxc-download.$$
mkdir -p "${DOWNLOAD_TEMP}"
DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$"
else
DOWNLOAD_TEMP=$(mktemp -d)
DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
fi

# Simply list images
Expand Down

0 comments on commit 1f3ae60

Please sign in to comment.