[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-40-g5b95770

[Daniel Baumann]

The branch, master has been updated
       via  5b957702d4984a380b8ebcf9d7f8f2c8e4d77582 (commit)
      from  0d0e8bb2689b6080e23c0f167de7b48fe91b59f0 (commit)


- Shortlog ------------------------------------------------------------
5b95770 Installing initramfs generator from local-packages, if available.

Summary of changes:
 helpers/lh_chroot_linux-image |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5b957702d4984a380b8ebcf9d7f8f2c8e4d77582
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jan 17 20:54:10 2008 +0100

    Installing initramfs generator from local-packages, if available.

diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index af93d1d..5b519b8 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -82,7 +82,10 @@ EOF
 			done
 		fi
 
-		PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
+		if ! ls config/chroot_local-packages/${LH_INITRAMFS}*.deb > /dev/null 2>&1
+		then
+			PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
+		fi
 
 		# Installing linux-image, modules and ${LH_INITRAMFS}
 		case "${LH_APT}" in
@@ -95,6 +98,26 @@ EOF
 				;;
 		esac
 
+		if ls config/chroot_local-packages/${LH_INITRAMFS}*.deb > /dev/null 2>&1
+		then
+			cp config/chroot_local-packages/${LH_INITRAMFS}*.deb chroot/root
+
+			Chroot "dpkg -i /root/${LH_INITRAMFS}*.deb" || true
+
+			# Cleaning dependencies
+			case "${LH_APT}" in
+				apt|apt-get)
+					Chroot "apt-get install -f --yes"
+					;;
+
+				aptitude)
+					Chroot "aptitude install -f --assume-yes"
+					;;
+			esac
+
+			rm -f chroot/root/${LH_INITRAMFS}*.deb
+		fi
+
 		# Saving cache
 		Save_cache cache/packages_linux-image
 

-- 
debian-live/live-helper