proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-04 10:23:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix download template for /tmp as tmpfs or noexec

Browse Source 
* 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 https://github.com/lxc/lxc/issues/516

Signed-off-by: Stuart Cardall <developer@it-offshore.co.uk>
This commit is contained in:
Stuart Cardall 2018-02-25 11:50:13 +00:00
parent 1401329e77
commit edb5452cec
No known key found for this signature in database
GPG Key ID: AEB857F1C891D0C6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/lxc-download.in
View File

@ -46,6 +46,7 @@ DOWNLOAD_URL=
DOWNLOAD_USE_CACHE="false"
DOWNLOAD_VALIDATE="true"
DOWNLOAD_VARIANT="default"
DOWNLOAD_TEMP=
LXC_MAPPED_GID=
LXC_MAPPED_UID=
@ -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