summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-12-05 14:06:12 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:37 +0100
commitd703d361fc6b707934ac521516999d31c92e6bc7 (patch)
tree4f2b6ae006cf22bd16ed79118aa287252283faa1 /functions
parented422781550e0e1272605b3ba46157d46cac8573 (diff)
downloadvyos-live-build-d703d361fc6b707934ac521516999d31c92e6bc7.tar.gz
vyos-live-build-d703d361fc6b707934ac521516999d31c92e6bc7.zip
Passing chroot directory explicitly to Apt() in preparation for multi-arch.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/wrapper.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index 3b8a67232..ab14a485e 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -10,13 +10,16 @@
Apt ()
{
+ CHROOT="${1}"
+ shift
+
case "${LB_APT}" in
apt|apt-get)
- Chroot chroot apt-get ${APT_OPTIONS} ${@}
+ Chroot ${CHROOT} apt-get ${APT_OPTIONS} ${@}
;;
aptitude)
- Chroot chroot aptitude ${APTITUDE_OPTIONS} ${@}
+ Chroot ${CHROOT} aptitude ${APTITUDE_OPTIONS} ${@}
;;
esac
}