[SCM] live-boot branch, debian-next, updated. debian/3.0_36-1-6-g6018395
Daniel Baumann
daniel at debian.org
Wed Jul 25 14:55:51 UTC 2012
The following commit has been merged in the debian-next branch:
commit 6018395a4e03044926fdb13c5e44d0b80648c87f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 25 16:56:36 2012 +0200
Factoring out debug into an own function.
diff --git a/scripts/boot/0110-cmdline b/scripts/boot/0110-debug
similarity index 67%
rename from scripts/boot/0110-cmdline
rename to scripts/boot/0110-debug
index 087549d..a74dcb7 100755
--- a/scripts/boot/0110-cmdline
+++ b/scripts/boot/0110-debug
@@ -2,15 +2,21 @@
#set -e
-Cmdline ()
+Debug ()
{
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
- # Special options
live-boot.debug|debug)
LIVE_DEBUG="true"
;;
esac
done
+
+ if [ "${LIVE_DEBUG}" != "true" ]
+ then
+ return 0
+ fi
+
+ set -x
}
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 8dcdfe6..2cf1d7e 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -19,14 +19,9 @@ Main ()
. /live.vars
_CMDLINE="$(cat /proc/cmdline)"
- Cmdline
Cmdline_old
- case "${LIVE_DEBUG}" in
- true)
- set -x
- ;;
- esac
+ Debug
Read_only
--
live-boot
More information about the debian-live-changes
mailing list