[SCM] live-helper branch, debian-next, updated. debian/2.0_a12-1-13-g8206ce0

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8206ce08fbe67fccc4c5a5d72d9a424d64f5a4d0
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri May 21 07:19:15 2010 +0200

    Also generating uuid for debian images by default (Closes: #578136).

diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
index f3cdb3c..1f264f3 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.

-- 
live-helper