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

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 805cebe2e4b13e9d746f516ce7400f01f466a970
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 5 10:24:40 2012 +0200

    Prefering default modules in initrd even on netboot images (Closes: #667594).

diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 1356112..bdebc33 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -151,14 +151,16 @@ case "${LB_BINARY_IMAGES}" in
 		then
 			mkdir chroot/etc/initramfs-tools
 		fi
-		if [ ! "$(grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf)" ]
+
+		# Configuring initramfs for NFS
+		if ! grep -qs "BOOT=nfs" chroot/etc/initramfs-tools/initramfs.conf
+		then
+			echo "BOOT=nfs" >> chroot/etc/initramfs-tools/initramfs.conf
+		fi
+
+		if ! grep -qs "NFSROOT=auto" chroot/etc/initramfs-tools/initramfs.conf
 		then
-			# Configuring initramfs for NFS
-cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
-MODULES=netboot
-BOOT=nfs
-NFSROOT=auto
-EOF
+			echo "NFSROOT=auto" >> chroot/etc/initramfs-tools/initramfs.conf
 		fi
 		;;
 esac

-- 
live-build