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

Merge "Make sure sbin paths are in $PATH"

Browse Source
This commit is contained in:
Jenkins 2013-12-18 09:43:26 +00:00 committed by Gerrit Code Review
commit d667324cc0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/common-defaults
View File

@ -43,8 +43,14 @@ export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}
export DIB_OFFLINE=${DIB_OFFLINE:-''}
# /sbin and friends aren't automatically included in $PATH when running sudo
# on SUSE Linux which breaks various pieces of this script in exciting ways,
# so inject them into the current $PATH if they're not there.
if ! [[ "$PATH" =~ "/sbin" ]] ; then
export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
# on Fedora/RHEL/SUSE Linux which breaks various pieces of this script in
# exciting ways, so inject them into the current $PATH if they're not there.
if ! [[ ":$PATH" =~ ":/sbin" ]] ; then
export PATH=$PATH:/sbin
fi
if ! [[ ":$PATH" =~ ":/usr/sbin" ]] ; then
export PATH=$PATH:/usr/sbin
fi
if ! [[ ":$PATH" =~ ":/usr/local/sbin" ]] ; then
export PATH=$PATH:/usr/local/sbin
fi