summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-21 07:19:15 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:08 +0100
commitcaf4ec860a4a36dd2006338a9705b5144ebfa740 (patch)
tree9a5baba478e340b68b1b70d517745857812e3a6e
parent130ebf98e2ec54d19e954e83437c298a01343af9 (diff)
downloadlive-build-caf4ec860a4a36dd2006338a9705b5144ebfa740.zip
live-build-caf4ec860a4a36dd2006338a9705b5144ebfa740.tar.gz
Generalizing uuid handling so that we can enable it in debian later too.
-rwxr-xr-xhelpers/chroot_hacks12
1 files changed, 11 insertions, 1 deletions
diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
index f3cdb3c..dfad9d1 100755
--- a/helpers/chroot_hacks
+++ b/helpers/chroot_hacks
@@ -142,7 +142,17 @@ EOF
esac
# Update initramfs (always, because of udev rules in initrd)
-Chroot chroot "CASPER_GENERATE_UUID=1 update-initramfs -k all -t -u"
+case "${LH_INITRAMFS}" in
+ live-initramfs)
+ #UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
+ ;;
+
+ casper)
+ UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
+ ;;
+esac
+
+Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
# Ensure readable permissions on initramfs. loop-aes-utils sets umask to
# protect GPG keys, which live-helper does not support.