Merge pull request #291 from marineam/path

make_chroot: explicitly set path when entering the chroot.
This commit is contained in:
Michael Marineau 2014-07-03 15:45:25 -07:00
commit 1c0de92363
2 changed files with 4 additions and 2 deletions

View File

@ -191,7 +191,8 @@ generate_locales() {
# with long multibyte strings. Newer setups have this fixed,
# but locale-gen doesn't need to be run in any locale in the
# first place, so just go with C to keep it fast.
chroot "${FLAGS_chroot}" env LC_ALL=C locale-gen -q -u \
PATH="/usr/sbin:/usr/bin:/sbin:/bin" LC_ALL=C \
chroot "${FLAGS_chroot}" locale-gen -q -u \
-G "$(printf '%s\n' "${gen_locales[@]}")"
fi
}

View File

@ -92,7 +92,8 @@ early_enter_chroot() {
# the overhead of enter_chroot, and do not need access to the source tree,
# don't need the actual chroot profile env, and can run the command as root.
bare_chroot() {
chroot "${FLAGS_chroot}" "$@"
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
chroot "${FLAGS_chroot}" "$@"
}
cleanup() {