[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-4-g0581356
Daniel Baumann
daniel at debian.org
Tue Jun 5 14:51:45 UTC 2012
The following commit has been merged in the debian-next branch:
commit 05813560322b1086061ed674e913a3e07bd4511f
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 5 16:51:44 2012 +0200
Removing some dead boot parameters.
diff --git a/scripts/boot/arguments.sh b/scripts/boot/arguments.sh
index e8636ee..28e07f1 100755
--- a/scripts/boot/arguments.sh
+++ b/scripts/boot/arguments.sh
@@ -4,9 +4,6 @@
Arguments ()
{
- PRESEEDS=""
- LOCATIONS=""
-
for ARGUMENT in $(cat /proc/cmdline)
do
case "${ARGUMENT}" in
@@ -15,22 +12,11 @@ Arguments ()
;;
skipconfig)
- NOACCESSIBILITY="true"
NOFASTBOOT="true"
NOFSTAB="true"
NONETWORKING="true"
- export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
- ;;
-
- access=*)
- ACCESS="${ARGUMENT#access=}"
- export ACCESS
- ;;
-
- console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONSOLE
+ export NOFASTBOOT NOFSTAB NONETWORKING
;;
BOOTIF=*)
@@ -47,12 +33,13 @@ Arguments ()
dhcp)
# Force dhcp even while netbooting
# Use for debugging in case somebody works on fixing dhclient
- DHCP="Force";
+ DHCP="true";
export DHCP
;;
nodhcp)
- unset DHCP
+ DHCP=""
+ export DHCP
;;
ethdevice=*)
@@ -180,11 +167,6 @@ Arguments ()
export NFS_COW
;;
- noaccessibility)
- NOACCESSIBILITY="true"
- export NOACCESSIBILITY
- ;;
-
nofastboot)
NOFASTBOOT="true"
export NOFASTBOOT
@@ -271,23 +253,6 @@ Arguments ()
export QUICKUSBMODULES
;;
- preseed/file=*|file=*)
- LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}"
- export LOCATIONS
- ;;
-
- nopreseed)
- NOPRESEED="true"
- export NOPRESEED
- ;;
-
- */*=*)
- question="${ARGUMENT%%=*}"
- value="${ARGUMENT#*=}"
- PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
- export PRESEEDS
- ;;
-
showmounts)
SHOWMOUNTS="true"
export SHOWMOUNTS
--
live-boot
More information about the debian-live-changes
mailing list