sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually set a sane PATH for inside chroot

Browse Source 
In I084aff7e449f5de811a6169ec90e352ada7da439 we attemped to address a
bug for systems which dont have a path that works well for inside a
chroot. Turns out there were multiple issues:
 * The PATH we were setting was after we attempted to call sh.
 * PATH was being set in a sibling process to the command being run.
 * PATH was not being exported so it was not effecting child processes.

Using env to set a sane path before we attempt to run our commands
addresses these issues.

Change-Id: I4285f8048465ee5c2490116447d32033007bd185
This commit is contained in:
Gregory Haynes 2015-04-28 00:02:15 +00:00
parent c1d7cb4d6c
commit f2a893b74c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/img-functions
View File

@ -56,18 +56,16 @@ function ensure_sudo () {
# Helper function to run a command inside the chroot # Helper function to run a command inside the chroot
function run_in_target () { function run_in_target () {
# Force the inclusion of a typical set of dirs in PATH, this is needed for guest cmd="$@"
# distros that have path elements not in the host PATH.
# Note that we're not expanding PATH during argument processing, the \$
# will preserve the PATH syntax until after the sh command runs
cmd="PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ; $@"
# -E to preserve http_proxy # -E to preserve http_proxy
ORIG_HOME=$HOME ORIG_HOME=$HOME
export HOME=/root export HOME=/root
# Force an empty TMPDIR inside the chroot. There is no need to use an user # Force an empty TMPDIR inside the chroot. There is no need to use an user
# defined tmp dir which may not exist in the chroot. # defined tmp dir which may not exist in the chroot.
# Bug: #1330290 # Bug: #1330290
sudo -E TMPDIR= chroot $TMP_MOUNT_PATH sh -c "$cmd" # Force the inclusion of a typical set of dirs in PATH, this is needed for guest
# distros that have path elements not in the host PATH.
sudo -E TMPDIR= chroot $TMP_MOUNT_PATH env PATH="\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" sh -c "$cmd"
export HOME=$ORIG_HOME export HOME=$ORIG_HOME
} }