diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-07 15:11:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:21 +0100 |
| commit | 83bc63f725263c571094e3af1c88c58992bf0ac6 (patch) | |
| tree | 25be3b96127e122c9f1448f6155dea6b03293248 /functions/chroot.sh | |
| parent | 293765885126c0fe429718f403be2802a225cd68 (diff) | |
| download | vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.tar.gz vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.zip | |
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
Diffstat (limited to 'functions/chroot.sh')
| -rwxr-xr-x | functions/chroot.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index 77d777a80..589200add 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -16,12 +16,12 @@ Chroot () # Executing commands in chroot Echo_debug "Executing: %s" "${COMMANDS}" - if [ "${LH_USE_FAKEROOT}" != "true" ] + if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS} + ${LB_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS} else # Building with fakeroot/fakechroot - ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS} + ${LB_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS} fi return "${?}" |