diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-04-23 17:44:01 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-04-23 17:44:01 +0200 |
| commit | f4370639f9a8caab6974412ac9e5981158e518c4 (patch) | |
| tree | 96117308c80feec886f84600f61bdc60c8a87501 | |
| parent | 890a6e5fb397e745ab3fb4bb5f8eda361716ed4e (diff) | |
| download | vyos-live-build-f4370639f9a8caab6974412ac9e5981158e518c4.tar.gz vyos-live-build-f4370639f9a8caab6974412ac9e5981158e518c4.zip | |
Making apt calls a bit more consistent over the different scripts.
| -rwxr-xr-x | scripts/build/lb_chroot_apt | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_sources | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index edfc033c6..aa1db74bf 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -139,7 +139,7 @@ case "${1}" in # them again. rm -f chroot/var/cache/apt/* > /dev/null 2>&1 || true rm -f chroot/var/lib/apt/lists/* > /dev/null 2>&1 || true - Chroot chroot "apt-get ${APT_OPTIONS} update" + Apt chroot update # Creating stage file Create_stagefile .stage/chroot_apt diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index 771c077e2..a4b3dcd0a 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -287,7 +287,7 @@ EOF # completed all the indices. case "${LB_PACKAGE_LISTS}" in stripped|minimal) - Chroot chroot "apt-get update" + Apt chroot update ;; esac @@ -435,6 +435,7 @@ EOF if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] then + Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" fi else # Get fresh indices @@ -480,7 +481,7 @@ EOF # Installing keyring packages if [ -n "${LB_KEYRING_PACKAGES}" ] then - Chroot chroot "apt-get --yes --force-yes install ${LB_KEYRING_PACKAGES}" + Apt chroot "--force-yes install ${LB_KEYRING_PACKAGES}" Apt chroot update fi |