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

Improve Fedora build host support.

Browse Source 
Sudo command (even using -E) resets $PATH for security reasons, Fedora
and other distos might have to explicitly add /usr/local/bin to $PATH
in order to run the commands in the chroot environment.

Change-Id: I95068ecf1e7437152e11c6d6789f59bcfd6ae9cc
This commit is contained in:
Lucas Alvares Gomes 2013-04-17 11:18:20 +01:00
parent 26ba473c72
commit 591059ffd3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/disk-image-create
View File

@ -25,6 +25,11 @@ export LANG=C
export DIB_ARGS="$@" export DIB_ARGS="$@"
export DIB_ENV=$(export) export DIB_ENV=$(export)
# Fedora and others don't always have /usr/local/bin in $PATH
if [[ ! "$PATH" == */usr/local/bin* ]] ; then
export PATH="${PATH}:/usr/local/bin/"
fi
SCRIPTNAME=$(basename $0) SCRIPTNAME=$(basename $0)
SCRIPT_HOME=$(dirname $0) SCRIPT_HOME=$(dirname $0)
export _LIB=$(dirname $0)/../lib export _LIB=$(dirname $0)/../lib

5
lib/img-functions
View File

@ -102,8 +102,9 @@ function create_base () {
# 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() {
# -E to preserve http_proxy # Explicitly set PATH to prevent sudo from resetting it
sudo -E chroot $TMP_MOUNT_PATH "$@" # and -E to preserve http_proxy
sudo -E PATH=${PATH} chroot $TMP_MOUNT_PATH "$@"
} }
# Helper function to run a directory of scripts inside the chroot # Helper function to run a directory of scripts inside the chroot