diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-02-21 20:03:57 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:36:05 +0100 |
| commit | 09f88a6e3837f71343dacb1bf7c6411183cca2cf (patch) | |
| tree | 93f74f348b4bb727f53393a42177a86a965d5d54 /helpers/lh_chroot_linux-image | |
| parent | 1ffce292fb24b3e77605a76e2388172927bebae7 (diff) | |
| download | vyos-live-build-09f88a6e3837f71343dacb1bf7c6411183cca2cf.tar.gz vyos-live-build-09f88a6e3837f71343dacb1bf7c6411183cca2cf.zip | |
Adding apt/aptitude options.
By using APT_OPTIONS and APTITUDE_OPTIONS in config/common,
one can manipulate the default options wich is made to each
and every apt and aptitude call.
Diffstat (limited to 'helpers/lh_chroot_linux-image')
| -rwxr-xr-x | helpers/lh_chroot_linux-image | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image index 7d3ee3145..d8718af36 100755 --- a/helpers/lh_chroot_linux-image +++ b/helpers/lh_chroot_linux-image @@ -88,15 +88,7 @@ EOF fi # Installing linux-image, modules and ${LH_INITRAMFS} - case "${LH_APT}" in - apt|apt-get) - Chroot "apt-get install --yes ${PACKAGES}" - ;; - - aptitude) - Chroot "aptitude install --assume-yes ${PACKAGES}" - ;; - esac + Apt install ${PACKAGES} if ls config/chroot_local-packages/${LH_INITRAMFS}*.deb > /dev/null 2>&1 then @@ -107,15 +99,7 @@ EOF Chroot "xargs --arg-file=/root/initfs dpkg -i" || true # Cleaning dependencies - case "${LH_APT}" in - apt|apt-get) - Chroot "apt-get install -f --yes" - ;; - - aptitude) - Chroot "aptitude install --assume-yes ${LH_INITRAMFS}" - ;; - esac + Apt install -f # Removing package files rm -f chroot/root/${LH_INITRAMFS}*.deb |