boot arguments could be case independent
diff -Naur initrd-110-7-orig.txt/scripts/live initrd.txt/scripts/live
--- initrd-110-7-orig.txt/scripts/live 2007-11-19 10:58:26.000000000 +0100
+++ initrd.txt/scripts/live 2007-11-19 17:18:48.000000000 +0100
@@ -33,18 +30,20 @@
Arguments ()
{
- PRESEEDS=""
+ local PRESEEDS=""
+ local ARGUMENT arg
for ARGUMENT in $(cat /proc/cmdline)
do
- case "${ARGUMENT}" in
+ arg="$(echo "${ARGUMENT}" | tr '[A-Z]' '[a-z]' )"
+ case "${arg}" in
access=*)
- ACCESS="${ARGUMENT#access=}"
+ ACCESS="$(get_param_value 'access=')"
export ACCESS
;;
console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
+ DEFCONSOLE="$(get_param_value '*=')"
export DEFCONSOLE
;;
@@ -56,24 +55,24 @@
;;
fetch=*)
- FETCH="${ARGUMENT#fetch=}"
+ FETCH="$(get_param_value 'fetch=')"
export FETCH
;;
hostname=*)
- HOSTNAME="${ARGUMENT#hostname=}"
+ HOSTNAME="$(get_param_value 'hostname=')"
LIVECONF="changed"
export HOSTNAME LIVECONF
;;
username=*)
- USERNAME="${ARGUMENT#username=}"
+ USERNAME="$(get_param_value 'username=')"
LIVECONF="changed"
export USERNAME LIVECONF
;;
userfullname=*)
- USERFULLNAME="${ARGUMENT#userfullname=}"
+ USERFULLNAME="$(get_param_value 'userfullname=')"
LIVECONF="changed"
export USERFULLNAME LIVECONF
;;
@@ -84,7 +83,7 @@
;;
ip=*)
- STATICIP="${ARGUMENT#ip=}"
+ STATICIP="$(get_param_value 'ip=')"
if [ -z "${STATICIP}" ]
then
@@ -95,27 +94,27 @@
;;
keyb=*|kbd-chooser/method=*)
- KBD="${ARGUMENT#*=}"
+ KBD="$(get_param_value '*=')"
export KBD
;;
klayout=*|console-setup/layoutcode=*)
- KLAYOUT="${ARGUMENT#*=}"
+ KLAYOUT="$(get_param_value '*=')"
export KLAYOUT
;;
kvariant=*|console-setup/variantcode=*)
- KVARIANT="${ARGUMENT#*=}"
+ KVARIANT="$(get_param_value '*=')"
export KVARIANT
;;
kmodel=*|console-setup/modelcode=*)
- KMODEL="${ARGUMENT#*=}"
+ KMODEL="$(get_param_value '*=')"
export KMODEL
;;
koptions=*)
- KOPTIONS="${ARGUMENT#koptions=}"
+ KOPTIONS="$(get_param_value 'koptions=')"
export KOPTIONS
;;
@@ -125,52 +124,52 @@
;;
live-media=*|bootfrom=*)
- LIVE_MEDIA="${ARGUMENT#*=}"
+ LIVE_MEDIA="$(get_param_value '*=')"
export LIVE_MEDIA
;;
live-media-encryption=*|encryption=*)
- LIVE_MEDIA_ENCRYPTION="${ARGUMENT#*=}"
+ LIVE_MEDIA_ENCRYPTION="$(get_param_value '*=')"
export LIVE_MEDIA_ENCRYPTION
;;
live-media-offset=*)
- LIVE_MEDIA_OFFSET="${ARGUMENT#live-media-offset=}"
+ LIVE_MEDIA_OFFSET="$(get_param_value 'live-media-offset=')"
export LIVE_MEDIA_OFFSET
;;
live-media-path=*)
- LIVE_MEDIA_PATH="${ARGUMENT#live-media-path=}"
+ LIVE_MEDIA_PATH="$(get_param_value 'live-media-path=')"
export LIVE_MEDIA_PATH
;;
live-media-timeout=*)
- LIVE_MEDIA_TIMEOUT="${ARGUMENT#live-media-timeout=}"
+ LIVE_MEDIA_TIMEOUT="$(get_param_value 'live-media-timeout=')"
export LIVE_MEDIA_TIMEOUT
;;
locale=*|debian-installer/locale=*)
- LOCALE="${ARGUMENT#*=}"
+ LOCALE="$(get_param_value '*=')"
export LOCALE
;;
module=*)
- MODULE="${ARGUMENT#module=}"
+ MODULE="$(get_param_value 'module=')"
export MODULE
;;
netboot=*)
- NETBOOT="${ARGUMENT#netboot=}"
+ NETBOOT="$(get_param_value 'netboot=')"
export NETBOOT
;;
nfsopts=*)
- NFSOPTS="${ARGUMENT#nfsopts=}"
+ NFSOPTS="$(get_param_value 'nfsopts=')"
export NFSOPTS
;;
nfscow=*)
- NFS_COW="${ARGUMENT#nfscow=}"
+ NFS_COW="$(get_param_value 'nfscow=')"
export NFS_COW
;;
@@ -259,6 +258,11 @@
export NOPROGRAMCRASHES
;;
+ notrackerd)
+ NOTRACKERD="Yes"
+ export NOTRACKERD
+ ;;
+
norestrictedmanager)
NORESTRICTEDMANAGER="Yes"
export NORESTRICTEDMANAGER
@@ -300,12 +304,12 @@
;;
nopersistent)
- NOPERSISTENT="Yes"
- export NOPERSISTENT
+ PERSISTENT=""
+ export PERSISTENT
;;
preseed/file=*|file=*)
- LOCATION="${ARGUMENT#*=}"
+ LOCATION="$(get_param_value '*=')"
export LOCATION
;;
@@ -315,7 +319,7 @@
;;
url=*)
- location="${ARGUMENT#url=}"
+ location="$(get_param_value 'url=')"
mount -n -o bind /sys /root/sys
mount -n -o bind /proc /root/proc
@@ -335,7 +339,7 @@
*/*=*)
question="${ARGUMENT%%=*}"
- value="${ARGUMENT#*=}"
+ value="$(get_param_value '*=')"
PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
export PRESEEDS
;;
@@ -351,7 +355,7 @@
;;
timezone=*)
- TIMEZONE="${ARGUMENT#timezone=}"
+ TIMEZONE="$(get_param_value 'timezone=')"
export TIMEZONE
;;
@@ -361,7 +365,7 @@
;;
todisk=*)
- TODISK="${ARGUMENT#todisk=}"
+ TODISK="$(get_param_value 'todisk=')"
export TODISK
;;
@@ -372,7 +376,7 @@
toram=*)
TORAM="Yes"
- MODULETORAM="${ARGUMENT#toram=}"
+ MODULETORAM="$(get_param_value 'toram=')"
export TORAM MODULETORAM
;;
@@ -382,12 +386,12 @@
;;
union=*)
- UNIONTYPE="${ARGUMENT#union=}"
+ UNIONTYPE="$(get_param_value 'union=')"
export UNIONTYPE
;;
utc=*)
- UTC="${ARGUMENT#utc=}"
+ UTC="$(get_param_value 'utc=')"
export UTC
;;
@@ -397,9 +401,96 @@
;;
xvideomode=*)
- XVIDEOMODE="${ARGUMENT#xvideomode=}"
+ XVIDEOMODE="$(get_param_value 'xvideomode=')"
export XVIDEOMODE
;;
esac
done
@@ -432,7 +523,8 @@
diff -Naur initrd-110-7-orig.txt/scripts/live-helpers initrd.txt/scripts/live-helpers
--- initrd-110-7-orig.txt/scripts/live-helpers 2007-11-19 10:58:26.000000000 +0100
+++ initrd.txt/scripts/live-helpers 2007-11-19 12:34:54.000000000 +0100
@@ -287,22 +297,63 @@
fi
done
done
+}
+
+# Get command line paramater value,
+# input parameter name, Ignore case distinctions in the parameter name
+# output parameter value
+get_param_value ()
+{
+ local paramname=${1}
+ local x
+
+ for x in $(cat /proc/cmdline)
+ do
+ if echo $x | grep -i $paramname > /dev/null
+ then
+ echo ${x#${paramname}}
+ return 0
+ break
+ fi
+ done
+ return 1
}
_______________________________________________
debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
