From f788126730ccd13eeef5a7a97796e001cfc6bb50 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Tue, 28 May 2013 06:52:33 +0200
Subject: [PATCH] Allowing to superseed live-boot cmdline through configuration
 files.

---
 scripts/boot/0010-debug                | 2 +-
 scripts/boot/0020-read-only            | 2 +-
 scripts/boot/0030-verify-checksums     | 2 +-
 scripts/boot/3020-swapon               | 2 +-
 scripts/boot/9990-cmdline-old          | 2 +-
 scripts/boot/9990-main.sh              | 2 +-
 scripts/boot/9990-select-eth-device.sh | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/boot/0010-debug b/scripts/boot/0010-debug
index 9b57d56..cfb2fc8 100755
--- a/scripts/boot/0010-debug
+++ b/scripts/boot/0010-debug
@@ -4,7 +4,7 @@
 
 Debug ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			live-boot.debug|debug)
diff --git a/scripts/boot/0020-read-only b/scripts/boot/0020-read-only
index 859f771..fc0dde0 100755
--- a/scripts/boot/0020-read-only
+++ b/scripts/boot/0020-read-only
@@ -4,7 +4,7 @@
 
 Read_only ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			live-boot.read-only=*|read-only=*)
diff --git a/scripts/boot/0030-verify-checksums b/scripts/boot/0030-verify-checksums
index 08b2972..3249b34 100755
--- a/scripts/boot/0030-verify-checksums
+++ b/scripts/boot/0030-verify-checksums
@@ -4,7 +4,7 @@
 
 Verify_checksums ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			live-boot.verify-checksums=*|verify-checksums=*)
diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 3df90de..a1bcdbe 100755
--- a/scripts/boot/3020-swapon
+++ b/scripts/boot/3020-swapon
@@ -4,7 +4,7 @@
 
 Swap ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			live-boot.swap=*|swap=*)
diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 18bb6c3..8bb8254 100755
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -4,7 +4,7 @@
 
 Cmdline_old ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			skipconfig)
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 8776a7d..e67176e 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -18,7 +18,7 @@ Live ()
 
 	. /live.vars
 
-	_CMDLINE="$(cat /proc/cmdline)"
+	LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
 	Cmdline_old
 
 	Debug
diff --git a/scripts/boot/9990-select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh
index 14fa4ef..7d1aa16 100755
--- a/scripts/boot/9990-select-eth-device.sh
+++ b/scripts/boot/9990-select-eth-device.sh
@@ -6,7 +6,7 @@ Select_eth_device ()
 	bootconf=$(egrep '^BOOT=' /conf/initramfs.conf | tail -1)
 
 	# can be superseded by command line (used by Debian-Live's netboot for example)
-	for ARGUMENT in ${_CMDLINE}
+	for ARGUMENT in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${ARGUMENT}" in
 			netboot=*)
@@ -46,7 +46,7 @@ Select_eth_device ()
 		fi
 
 		# If user force to use specific device, write it
-		for ARGUMENT in ${_CMDLINE}
+		for ARGUMENT in ${LIVE_BOOT_CMDLINE}
 		do
 			case "${ARGUMENT}" in
 				live-netdev=*)
-- 
2.1.4