From 805cebe2e4b13e9d746f516ce7400f01f466a970 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 5 Apr 2012 10:24:40 +0200 Subject: Prefering default modules in initrd even on netboot images (Closes: #667594). --- scripts/build/lb_chroot_hacks | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'scripts/build/lb_chroot_hacks') diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 1356112d3..bdebc331e 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 -- cgit v1.2.3