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

Daniel Baumann daniel at debian.org
Fri Jan 18 08:23:46 UTC 2008


The branch, master has been updated
       via  84d7dc0ccd74048c8eb1215599595739b1ea6fcf (commit)
      from  bdba07d1cd3f12b7221a828b32c45760bec86d5f (commit)


- Shortlog ------------------------------------------------------------
84d7dc0 Correcting wrong installation attempt of initramfs generator from local-packages.

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

commit 84d7dc0ccd74048c8eb1215599595739b1ea6fcf
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 18 09:23:32 2008 +0100

    Correcting wrong installation attempt of initramfs generator from local-packages.

diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 5b519b8..84157d0 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -102,7 +102,9 @@ EOF
 		then
 			cp config/chroot_local-packages/${LH_INITRAMFS}*.deb chroot/root
 
-			Chroot "dpkg -i /root/${LH_INITRAMFS}*.deb" || true
+			# Installing package
+			Chroot "find /root -name *.deb" > chroot/root/initfs
+			Chroot "xargs --arg-file=/root/initfs dpkg -i" || true
 
 			# Cleaning dependencies
 			case "${LH_APT}" in
@@ -115,7 +117,9 @@ EOF
 					;;
 			esac
 
+			# Removing package files
 			rm -f chroot/root/${LH_INITRAMFS}*.deb
+			rm -f chroot/root/initfs
 		fi
 
 		# Saving cache

-- 
debian-live/live-helper



More information about the debian-live-changes mailing list