[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-14-gd91017d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d91017d2fa51ee687c1e3afb1f9ad2eecbd2e2f9
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 18:57:24 2012 +0200

    Removing fastboot handling, the normal system handles this via 'fastboot' bootparameter already.

diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
index 848fc2f..871180c 100755
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ b/initramfs-tools/scripts/live-bottom/12fstab
@@ -44,9 +44,4 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ "${NOFASTBOOT}" != "true" ]
-then
-	touch root/fastboot
-fi
-
 log_end_msg
diff --git a/scripts/boot/cmdline.sh b/scripts/boot/cmdline.sh
index e5f7ce1..fbfd3d6 100755
--- a/scripts/boot/cmdline.sh
+++ b/scripts/boot/cmdline.sh
@@ -27,11 +27,10 @@ Cmdline ()
 
 			# parameters below need review (FIXME)
 			skipconfig)
-				NOFASTBOOT="true"
 				NOFSTAB="true"
 				NONETWORKING="true"
 
-				export NOFASTBOOT NOFSTAB NONETWORKING
+				export NOFSTAB NONETWORKING
 				;;
 
 			BOOTIF=*)
@@ -160,11 +159,6 @@ Cmdline ()
 				export NFS_COW
 				;;
 
-			nofastboot)
-				NOFASTBOOT="true"
-				export NOFASTBOOT
-				;;
-
 			nofstab)
 				NOFSTAB="true"
 				export NOFSTAB

-- 
live-boot