[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-10-g7b2994e

[Chris Lamb]

The following commit has been merged in the master branch:
commit 9e6c04702f87181df9c2e8b770eb20b46a6405fb
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Mar 22 02:44:18 2008 +0000

    lh_chroot_linux-image: Install dependencies differently when using aptitude
    
    We must use "aptitude install <pkgname>" to install dependencies of a
    dpkg-installed <pkgname>, or aptitude's resolver will remove it. apt-get
    does not have this "feature".
    
    This was causing a problem when using a custom versions of live-initramfs
    as they would be removed, causing a boot failure.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 59e5dd3..c409b77 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -98,8 +98,15 @@ EOF
 			Chroot "find /root -name *.deb" > chroot/root/initfs
 			Chroot "xargs --arg-file=/root/initfs dpkg -i" || true
 
-			# Cleaning dependencies
-			Apt install -f
+			# Install dependencies
+			case "${LH_APT}" in
+				aptitude)
+					Apt install ${LH_INITRAMFS}
+					;;
+				apt-get)
+					Apt install -f
+					;;
+			esac
 
 			# Removing package files
 			rm -f chroot/root/${LH_INITRAMFS}*.deb

-- 
debian-live/live-helper