Passing chroot directory explicitly to Apt() in preparation for multi-arch.

3 files changed, 11 insertions, 8 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
 }
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 2b7c1d68a..d5a7d7fbc 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -138,7 +138,7 @@ case "${LB_BINARY_IMAGES}" in
 	net)
 		if [ ! -f chroot/usr/bin/smbmount ]
 		then
-			Apt install smbfs
+			Apt chroot install smbfs
 		fi
 
 		if [ ! -d chroot/etc/initramfs-tools ]
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 5b77f6537..8d6dc764d 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -411,15 +411,15 @@ EOF
 				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
 			fi
 
-			Apt update
-			Apt upgrade
-			Apt dist-upgrade
+			Apt chroot update
+			Apt chroot upgrade
+			Apt chroot dist-upgrade
 
 			# Installing keyring packages
 			if [ -n "${LB_KEYRING_PACKAGES}" ]
 			then
 				Chroot chroot "apt-get --yes --force-yes install ${LB_KEYRING_PACKAGES}"
-				Apt update
+				Apt chroot update
 			fi
 
 			if [ "${LB_CACHE_INDICES}" = "true" ]
@@ -625,7 +625,7 @@ EOF
 		fi
 
 		# Updating indices
-		Apt update
+		Apt chroot update
 
 		# Cleaning apt package cache
 		rm -rf chroot/var/cache/apt