summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-05-02 08:42:22 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:44 +0100
commitdeaa1214dcac463b698a7cf8b6201bd5e6d3c721 (patch)
tree855f3b27d14e31c98b1796fa6943d792aad1aec6
parent695d3eedeed6d348c55752bdd5293178ff4848de (diff)
downloadlive-build-deaa1214dcac463b698a7cf8b6201bd5e6d3c721.zip
live-build-deaa1214dcac463b698a7cf8b6201bd5e6d3c721.tar.gz
Adding update-initramfs call back in lh_chroot_hacks, but only for netboot.
-rwxr-xr-xhelpers/lh_chroot_hacks15
1 files changed, 9 insertions, 6 deletions
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index f23853f..03fa50b 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -40,6 +40,12 @@ Create_lockfile .lock
# Removing udev mac caching rule
rm -f chroot/etc/udev/rules.d/*persistent-net.rules
+# Remove resume
+if [ "${LH_DISTRIBUTION}" = "etch" ] && [ -e /etc/initramfs-tools/conf.d/resume ]
+then
+ rm -f /etc/initramfs-tools/conf.d/resume
+fi
+
case "${LH_BINARY_IMAGES}" in
net)
if [ ! -f chroot/usr/bin/smbmount ]
@@ -60,15 +66,12 @@ BOOT=nfs
NFSROOT=auto
EOF
fi
+
+ # Update initramfs
+ Chroot "update-initramfs -k all -t -u"
;;
esac
-# Remove resume
-if [ "${LH_DISTRIBUTION}" = "etch" ] && [ -e /etc/initramfs-tools/conf.d/resume ]
-then
- rm -f /etc/initramfs-tools/conf.d/resume
-fi
-
# Ensure readable permissions on initramfs. loop-aes-utils sets umask to
# protect GPG keys, which live-helper does not support.
# Note: Use find rather than chmod on the wildcard, one never knows what