[SCM] live-build branch, debian, updated. debian/3.0_a45-1-23-g982e2fb

Daniel Baumann daniel at debian.org
Thu Apr 5 08:42:11 UTC 2012


The following commit has been merged in the debian branch:
commit 8fa786ba892bff6e5ffbb90c9cdb0061d3b32b87
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Mar 7 18:12:26 2012 +0100

    Avoid calling update-initrd in lb_chroot_hacks if the target system has no initrd, thanks to Hector Oron <zumbi at debian.org>.

diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 128d6b8..1356112 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -174,7 +174,10 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
-Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+if [ "${LB_INITRAMFS}" != "none" ]
+then
+	Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+fi
 
 # We probably ought to use COMPRESS= in a temporary file in
 # /etc/initramfs-tools/conf.d/ instead, but it's hard to pass options that

-- 
live-build



More information about the debian-live-changes mailing list