templates: Make sure usual locations are in PATH

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
index d1ae9f3ff0da70434d8c9cb91598411b3c8be29b..5c4c585060b917f3abdf2fa7660b699c87320ec8 100644 (file)
--- a/templates/lxc-alpine.in
+++ b/templates/lxc-alpine.in
@@ -10,6 +10,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 key_sha256sums="9c102bcc376af1498d549b77bdbfa815ae86faa1d2d82f040e616b18ef2df2d4  alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
 2adcf7ce224f476330b5360ca5edb92fd0bf91c92d83292ed028d7c4e26333ab  alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub"
 

diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index e64ad24c6fd8ac6379987cb23276e82059937b17..cc6f6d62ff3ac4b0de3282540e20d88a27c6b8ba 100644 (file)
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -34,6 +34,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 #Configurations
 arch=$(uname -m)
 cache_base=@LOCALSTATEDIR@/cache/lxc/altlinux/$arch

diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index d3d5f73c27e26bbc26c211112a65d93124dafc9f..1b9b7ec39e7b5fc6a100e3ac028ced55ec9815b8 100644 (file)
--- a/templates/lxc-archlinux.in
+++ b/templates/lxc-archlinux.in
@@ -35,6 +35,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 # defaults
 arch=$(uname -m)
 lxc_network_type="veth"

diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index dae154121e68e96a78a46d57540b40542f92aefe..90b995a0714a82a202fa3a16729f52b057760a75 100644 (file)
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -30,6 +30,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 am_in_userns() {
     [ -e /proc/self/uid_map ] || { echo no; return; }
     [ "$(wc -l /proc/self/uid_map | awk '{ print $1 }')" -eq 1 ] || { echo yes; return; }

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index d089a15575706cdb1722af6e5bed80e24acafd34..7be75d36be42ef8597fc873541fa3cd7a56c64a5 100644 (file)
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -82,6 +82,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 if [ -e /etc/os-release ]
 then
 # This is a shell friendly configuration file.  We can just source it.

diff --git a/templates/lxc-cirros.in b/templates/lxc-cirros.in
index 24c59a9c1e8b1c532f17102444df5ae93c750c75..3ef212a2115e7f4f7d393ed73ae287a12525e15d 100644 (file)
--- a/templates/lxc-cirros.in
+++ b/templates/lxc-cirros.in
@@ -31,6 +31,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 VERBOSITY=0
 DOWNLOAD_URL="http://download.cirros-cloud.net/"
 CACHE_D="@LOCALSTATEDIR@/cache/lxc/cirros"

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index cb19ba4842b627ad1be8ca5e19cec51a3e03dc3d..33ce8e2ea0a701dca8fecd8d4bb6e057975d0347 100644 (file)
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -30,6 +30,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 MIRROR=${MIRROR:-http://cdn.debian.net/debian}
 LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index d615b8db67c8f398485cf9e5703f5a0af439abb8..7334e5494b79fa0768b8a9f0998f6844bdd64e69 100644 (file)
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -58,6 +58,9 @@ if [ -n "${http_proxy:-}" ]; then
     DOWNLOAD_KEYSERVER="${DOWNLOAD_KEYSERVER}:80"
 fi
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 # Some useful functions
 cleanup() {
     if [ -d "$DOWNLOAD_TEMP" ]; then

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 5ab3852aba643d5c3257b66812c9a10dcb49e18f..92efb91ab2819949fd0f43a569c7205f0a768762 100644 (file)
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -82,6 +82,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 if [ -e /etc/os-release ]
 then
 # This is a shell friendly configuration file.  We can just source it.

diff --git a/templates/lxc-gentoo.in b/templates/lxc-gentoo.in
index e59ed457226444a3b8bef54ced21a0326fed123e..3e254ffccfdce1c5732b026d1f47c972b97f12c8 100644 (file)
--- a/templates/lxc-gentoo.in
+++ b/templates/lxc-gentoo.in
@@ -23,6 +23,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 # Ensure strict root's umask doesen't render the VM unusable
 umask 022
 

diff --git a/templates/lxc-openmandriva.in b/templates/lxc-openmandriva.in
index ddc9863fa1969c5e8a007d8b217819b170507ddf..bb3e946145d9794e78eb3fc6a62c1a52078eeb41 100644 (file)
--- a/templates/lxc-openmandriva.in
+++ b/templates/lxc-openmandriva.in
@@ -36,6 +36,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 #Configurations
 #distro=cooker
 hostarch=$(uname -m)

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index df517a699e36b504a575c04f6642a08a5dd2a834..bd33f568a35f7e6d49b04bce0c29c5746efd7907 100644 (file)
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -35,6 +35,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 DISTRO=12.3
 
 configure_opensuse()

diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
index ae64bc6345d837f9db4d715845131f0643eec141..f19b7d0aa7285f03ca8a5802bdd6959c7c9db32c 100644 (file)
--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -37,6 +37,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 # use virbr0 that is setup by default by libvirtd
 lxc_network_type=veth
 lxc_network_link=virbr0

diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index c8cf3a50798ced87ccffeda4af22c86c51b31814..1db5645c265656da7874200c7d8780080f0495a9 100644 (file)
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -38,6 +38,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 [ -r /etc/default/lxc ] && . /etc/default/lxc
 
 DLSCHEME=${DLSCHEME:-"http"}

diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index 2c3cd7fc93b5a0adf49bce40a86bf70c7a99a97a..2e8a00cdc673399fe85993c99d911dbc64e8b38a 100644 (file)
--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -30,6 +30,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 install_sshd()
 {
     rootfs=$1

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 07cb87d9b6824a7efcb600d74b988b92d228ea4c..5de1dbd59566bdd5902e5f3817b4b77f6b5fb9aa 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -28,6 +28,9 @@ LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 KNOWN_RELEASES="lucid precise quantal saucy trusty"
 skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0}
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 if [ -r /etc/default/lxc ]; then
     . /etc/default/lxc
 fi

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 85df042fae03d8324478a9c38e937ea14216049e..cc74f81dcd4d1d8ff9faa09058af49ac138ca54f 100644 (file)
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -34,6 +34,9 @@ for arg in "$@"; do
     fi
 done
 
+# Make sure the usual locations are in PATH
+export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
+
 set -e
 
 LOCALSTATEDIR="@LOCALSTATEDIR@"