diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-05 10:24:40 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 10:24:40 +0200 |
| commit | 805cebe2e4b13e9d746f516ce7400f01f466a970 (patch) | |
| tree | 3e23f25244cef7efcd90677b4fc95183e6ff0ab8 | |
| parent | 544bde3039a80d7ed1f934529eacb352862becfd (diff) | |
| download | vyos-live-build-805cebe2e4b13e9d746f516ce7400f01f466a970.tar.gz vyos-live-build-805cebe2e4b13e9d746f516ce7400f01f466a970.zip | |
Prefering default modules in initrd even on netboot images (Closes: #667594).
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 16 |
1 files changed, 9 insertions, 7 deletions
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 |