From 6e9f8956ee17b9f171571698fbc23a54a49424d5 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat, 22 Mar 2008 02:44:18 +0000
Subject: 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.
---
 helpers/lh_chroot_linux-image | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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
-- 
cgit v1.0