diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-10-28 16:44:06 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:43 +0100 |
| commit | 1c1e7db6c44d639fd51ee23061087c7d14b6ef6b (patch) | |
| tree | e20b0cfa3a45140a39be0cadf45410eab5cc22e7 /functions/chroot.sh | |
| parent | 6696b019fe03a371d69c50a1ef82223e4bb364a7 (diff) | |
| download | vyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.tar.gz vyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.zip | |
Generalizing internal Chroot(); by requiring its first argument to be the chroot directory.
Diffstat (limited to 'functions/chroot.sh')
| -rwxr-xr-x | functions/chroot.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index 227f792c6..d66578752 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -11,6 +11,7 @@ set -e Chroot () { + CHROOT="${1}"; shift COMMANDS="${@}" # Executing commands in chroot @@ -18,10 +19,10 @@ Chroot () if [ "${LH_USE_FAKEROOT}" != "enabled" ] then - ${LH_ROOT_COMMAND} 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} + ${LH_ROOT_COMMAND} 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} else # Building with fakeroot/fakechroot - ${LH_ROOT_COMMAND} chroot chroot ${COMMANDS} + ${LH_ROOT_COMMAND} chroot "${CHROOT}" ${COMMANDS} fi return "${?}" |