[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-66-gbb7523c
Daniel Baumann
daniel at debian.org
Fri Jun 5 10:20:55 UTC 2009
The following commit has been merged in the master branch:
commit bb7523cb98baa4203f0002de8f50217c9d7d9176
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date: Thu Jun 4 13:57:47 2009 +0200
Also respecting general apt/aptitude options for the install functions used during binary stage.
diff --git a/functions/packages.sh b/functions/packages.sh
index 53c244a..13c0bf4 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
--
Debian Live build scripts
More information about the debian-live-changes
mailing list