Commit 655d10ed by Christian Ratzenhofer

templates/*.in: fixed PATH handling with spaces

if $PATH already contains a path with a space the append of the default directories in all template scripts fails with an error like the following: /usr/share/lxc/templates/lxc-download: 69: export: (x86)/NVIDIA: bad variable name Signed-off-by: 's avatarChristian Ratzenhofer <christian.ratzenhofer@cdnm.at>
parent 093bfcc8
...@@ -26,7 +26,7 @@ LXC_MAPPED_GID= ...@@ -26,7 +26,7 @@ LXC_MAPPED_GID=
BUSYBOX_EXE=`which busybox` BUSYBOX_EXE=`which busybox`
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH
export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
in_userns() { in_userns() {
[ -e /proc/self/uid_map ] || { echo no; return; } [ -e /proc/self/uid_map ] || { echo no; return; }
......
...@@ -66,7 +66,7 @@ if [ -z "${DOWNLOAD_KEYSERVER:-}" ]; then ...@@ -66,7 +66,7 @@ if [ -z "${DOWNLOAD_KEYSERVER:-}" ]; then
fi fi
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH
export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
# Some useful functions # Some useful functions
cleanup() { cleanup() {
......
...@@ -33,7 +33,7 @@ MODE="system" ...@@ -33,7 +33,7 @@ MODE="system"
COMPAT_LEVEL=5 COMPAT_LEVEL=5
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH
export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
in_userns() { in_userns() {
[ -e /proc/self/uid_map ] || { echo no; return; } [ -e /proc/self/uid_map ] || { echo no; return; }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
set -eu set -eu
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH
export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
# Check for required binaries # Check for required binaries
for bin in skopeo umoci jq; do for bin in skopeo umoci jq; do
......
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