diff options
| author | Cody A.W. Somerville <cody.somerville@canonical.com> | 2009-06-04 13:57:47 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:44 +0100 |
| commit | 5239579ad0b5c5f17344f0931adf52792a6029d8 (patch) | |
| tree | 06da262646cdc72c5db77ab878d9317b3ac72ec2 /functions | |
| parent | fb715a51eba0e5d6234a88742e2d65693ab05663 (diff) | |
| download | vyos-live-build-5239579ad0b5c5f17344f0931adf52792a6029d8.tar.gz vyos-live-build-5239579ad0b5c5f17344f0931adf52792a6029d8.zip | |
Also respecting general apt/aptitude options for the install functions used during binary stage.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/packages.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/functions/packages.sh b/functions/packages.sh index 53c244a89..13c0bf4db 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -32,11 +32,11 @@ Install_package () then case "${LH_APT}" in apt|apt-get) - Chroot chroot "apt-get install -o APT::Install-Recommends=false --yes ${_LH_PACKAGES}" + Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LH_PACKAGES}" ;; aptitude) - Chroot chroot "aptitude install --without-recommends --assume-yes ${_LH_PACKAGES}" + Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LH_PACKAGES}" ;; esac fi @@ -48,11 +48,11 @@ Remove_package () then case "${LH_APT}" in apt|apt-get) - Chroot chroot "apt-get remove --purge --yes ${_LH_PACKAGES}" + Chroot chroot "apt-get remove --purge ${APT_OPTIONS} ${_LH_PACKAGES}" ;; aptitude) - Chroot chroot "aptitude purge --assume-yes ${_LH_PACKAGES}" + Chroot chroot "aptitude purge ${APTITUDE_OPTIONS} ${_LH_PACKAGES}" ;; esac fi |