diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-12-05 14:06:12 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:37 +0100 |
| commit | d703d361fc6b707934ac521516999d31c92e6bc7 (patch) | |
| tree | 4f2b6ae006cf22bd16ed79118aa287252283faa1 /scripts/build | |
| parent | ed422781550e0e1272605b3ba46157d46cac8573 (diff) | |
| download | vyos-live-build-d703d361fc6b707934ac521516999d31c92e6bc7.tar.gz vyos-live-build-d703d361fc6b707934ac521516999d31c92e6bc7.zip | |
Passing chroot directory explicitly to Apt() in preparation for multi-arch.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_sources | 10 |
2 files changed, 6 insertions, 6 deletions
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 |