[SCM] live-build branch, debian, updated. debian/2.0_a26-1

Daniel Baumann daniel at debian.org
Mon Sep 6 13:36:34 UTC 2010 

The following commit has been merged in the debian branch:
commit 09c9c6b8a1abce5c0c4400b2933ca2f6cde0ae2e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 4 12:52:01 2010 +0200

    Adding support for standalone live-boot as initramfs generator.

diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption
index 02732fa..79b556d 100755
--- a/scripts/build/binary_encryption
+++ b/scripts/build/binary_encryption
@@ -70,7 +70,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index b58b189..1597b3c 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -122,7 +122,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
@@ -135,7 +135,7 @@ case "${LH_BINARY_IMAGES}" in
 				DESTDIR_LIVE="binary/casper"
 				;;
 
-			live-initramfs)
+			live-initramfs|live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
 		esac
@@ -171,7 +171,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_USERNAME}" != "user" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
@@ -187,7 +187,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_HOSTNAME}" != "debian" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 33f7ebb..3813c76 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -96,7 +96,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
@@ -109,7 +109,7 @@ case "${LH_BINARY_IMAGES}" in
 				DESTDIR_LIVE="binary/casper"
 				;;
 
-			live-initramfs)
+			live-initramfs|live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
 		esac
@@ -145,7 +145,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_USERNAME}" != "user" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
@@ -161,7 +161,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_HOSTNAME}" != "debian" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index 70dd60b..e6b1629 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -48,7 +48,7 @@ case "${LH_INITRAMFS}" in
 		DESTDIR="binary/casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		DESTDIR="binary/live"
 		;;
 
@@ -77,7 +77,7 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
 cp chroot/boot/initrd.img-* "${DESTDIR}"
 
 case "${LH_INITRAMFS}" in
-	live-initramfs)
+	live-initramfs|live-boot)
 		if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ]
 		then
 			cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 126931a..2c57cfd 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -49,7 +49,7 @@ case "${LH_INITRAMFS}" in
 		SUFFIX="manifest"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		SUFFIX="packages"
 		;;
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 1aec885..a1dad45 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -84,7 +84,7 @@ case "${LH_INITRAMFS}" in
 		DESTDIR="binary/casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		DESTDIR="binary/live"
 		;;
 esac
diff --git a/scripts/build/binary_net b/scripts/build/binary_net
index 33cbb10..6f7f94b 100755
--- a/scripts/build/binary_net
+++ b/scripts/build/binary_net
@@ -66,7 +66,7 @@ then
 			ORIGDIR="binary/casper"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			ORIGDIR="binary/live"
 			;;
 	esac
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 7b44be5..65cec18 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -53,7 +53,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
index 293066b..b187c2c 100755
--- a/scripts/build/binary_silo
+++ b/scripts/build/binary_silo
@@ -113,7 +113,7 @@ case "${LH_INITRAMFS}" in
 		DESTDIR_LIVE="binary/casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		DESTDIR_LIVE="binary/live"
 		;;
@@ -138,7 +138,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_USERNAME}" != "user" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
@@ -154,7 +154,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_HOSTNAME}" != "debian" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 5379c50..ae74641 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -357,7 +357,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
@@ -424,7 +424,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_USERNAME}" != "user" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
@@ -440,7 +440,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_HOSTNAME}" != "debian" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot
index 98cab43..4ba0b27 100755
--- a/scripts/build/binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -129,7 +129,7 @@ case "${LH_INITRAMFS}" in
 		INITFS="casper"
 		;;
 
-	live-initramfs)
+	live-initramfs|live-boot)
 		INITFS="live"
 		;;
 esac
@@ -142,7 +142,7 @@ case "${LH_BINARY_IMAGES}" in
 				DESTDIR_LIVE="binary/casper"
 				;;
 
-			live-initramfs)
+			live-initramfs|live-boot)
 				DESTDIR_LIVE="binary/live"
 				;;
 		esac
@@ -177,7 +177,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_USERNAME}" != "user" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
@@ -193,7 +193,7 @@ then
 			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
 			;;
 
-		live-initramfs)
+		live-initramfs|live-boot)
 			if [ "${LH_HOSTNAME}" != "debian" ]
 			then
 				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 4417e33..eb89021 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -159,13 +159,13 @@ esac
 
 # Update initramfs (always, because of udev rules in initrd)
 case "${LH_INITRAMFS}" in
-	live-initramfs)
-		#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
-		;;
-
 	casper)
 		UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
 		;;
+
+	live-initramfs|live-boot)
+		#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
+		;;
 esac
 
 Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
@@ -198,7 +198,7 @@ case "${LH_INITRAMFS}" in
 		ID="999"
 		;;
 
-	*)
+	live-initramfs|live-boot)
 		ID="1000"
 		;;
 esac
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 7b20232..da8229f 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -54,10 +54,11 @@ warn_initrd = No
 EOF
 
 		# Diverting update-initramfs
-		#if [ "${LH_INITRAMFS}" = "live-initramfs" ]
-		#then
-		#	mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
-		#fi
+		#case "${LH_INITRAMFS}" in
+		#	live-initramfs|live-boot)
+		#		mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
+		#		;;
+		#esac
 
 		if [ "${LH_LINUX_PACKAGES}" != "none" ]
 		then

-- 
live-build

More information about the debian-live-changes mailing list