[SCM] live-boot branch, debian-next, updated. debian/3.0_36-1-5-g783930a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9cb8cd5faea56747541f8b243f850882326adaa5
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 25 16:46:11 2012 +0200

    Making read-only function self contained.

diff --git a/scripts/boot/0110-cmdline b/scripts/boot/0110-cmdline
index a959c73..6486515 100755
--- a/scripts/boot/0110-cmdline
+++ b/scripts/boot/0110-cmdline
@@ -7,10 +7,6 @@ Cmdline ()
 	for _PARAMETER in ${_CMDLINE}
 	do
 		case "${_PARAMETER}" in
-			live-boot.read-only|read-only)
-				LIVE_READ_ONLY="true"
-				;;
-
 			live-boot.verify-checksums|verify-checksums)
 				LIVE_VERIFY_CHECKSUMS="true"
 				;;
diff --git a/scripts/boot/0120-read-only b/scripts/boot/0120-read-only
index 588d57b..948c2d5 100755
--- a/scripts/boot/0120-read-only
+++ b/scripts/boot/0120-read-only
@@ -4,6 +4,20 @@
 
 Read_only ()
 {
+	for _PARAMETER in ${_CMDLINE}
+	do
+		case "${_PARAMETER}" in
+			live-boot.read-only|read-only)
+				LIVE_READ_ONLY="true"
+				;;
+		esac
+	done
+
+	if [ "${LIVE_READ_ONLY}" != "true" ]
+	then
+		return 0
+	fi
+
 	# Marking some block devices as read-only to ensure that nothing
 	# gets written as linux still writes to 'only' read-only mounted filesystems.
 	_DEVICES="/dev/sd* /dev/vd*"
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index b1bdf42..5be1277 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -28,11 +28,7 @@ Main ()
 			;;
 	esac
 
-	case "${LIVE_READ_ONLY}" in
-		true)
-			Read_only
-			;;
-	esac
+	Read_only
 
 	Select_eth_device
 

-- 
live-boot