[Debian-live-changes] r1467 - in dists/trunk/live-initramfs:
manpages scripts scripts/live-bottom
Daniel Baumann
daniel at alioth.debian.org
Fri May 11 19:08:30 UTC 2007
Author: daniel
Date: 2007-05-11 19:08:29 +0000 (Fri, 11 May 2007)
New Revision: 1467
Modified:
dists/trunk/live-initramfs/manpages/live-initramfs.en.7
dists/trunk/live-initramfs/scripts/live
dists/trunk/live-initramfs/scripts/live-bottom/00md5check
dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
Log:
Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-05-11 17:32:03 UTC (rev 1466)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-05-11 19:08:29 UTC (rev 1467)
@@ -18,20 +18,20 @@
Here is the complete list of recognized boot parameters by live\-initramfs.
.IP "\fBaccess=\fR\fIACCESS\fR" 4
Set the accessibility level for physically or visually impared users. ACCESS must be one of v1, v2, v3, m1, or m2. v1=lesser visual impairment, v2=moderate visual impairment, v3=blindness, m1=minor motor difficulties, m2=moderate motor difficulties.
-.IP "\fBlive\-getty\fR" 4
-This changes the auto\-login on virtual terminals to use the (experimental) live\-getty code. With this option set the standard kernel argument "console=" is parsed and if a serial console is specified then live\-getty is used to autologin on the serial console.
.IP "\fBconsole=\fR\fITTY\fR,\fISPEED\fR" 4
Set the default console to be used with the "live\-getty" option. Example: "console=ttyS0,115200"
-.IP "\fBhostname=\fR\fIHOSTNAME\fR, \fBuserfullname=\fR\fIUSERFULLNAME\fR, \fBusername=\fR\fIUSERNAME\fR"4
+.IP "\fBhostname=\fR\fIHOSTNAME\fR, \fBusername=\fR\fIUSERFULLNAME\fR, \fBusername=\fR\fIUSERNAME\fR"4
Those parameters lets you override values read from the config file.
-.IP "\fB{keyb|kbd\-chooser/method}=\fR\fIKEYBOARD\fR, \fB{klayout|console\-setup/layoutcode}=\fR\fILAYOUT\fR, \fB{kvariant|console\-setup/variantcode}=\fR\fIVARIANT\fR, \fB{kmodel|console\-setup/modelcode}=\fR\fICODE\fR, \fBkoptions=\fR\fIOPTIONS\fR" 4
-Configure the running keyboard as specified, if this one misses live\-initramfs behaves as if "keyb=us" was specified. It will be interfered from "locale=" if locale is only 2 lowecase letters as a special case. You could also specify console layout, variant, code, and options (no defaults).
.IP "\fBintegrity\-check\fR" 4
If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media.
.IP "\fBip=\fR\fIIFACE,ADDRESS,NETMASK,GATEWAY [:IFACE,ADDRESS,NETMASK,GATEWAY]\fR*" 4
Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification.
.IP "\fBip\fR[=frommedia]" 4
If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.
+.IP "\fB{keyb|kbd\-chooser/method}=\fR\fIKEYBOARD\fR, \fB{klayout|console\-setup/layoutcode}=\fR\fILAYOUT\fR, \fB{kvariant|console\-setup/variantcode}=\fR\fIVARIANT\fR, \fB{kmodel|console\-setup/modelcode}=\fR\fICODE\fR, \fBkoptions=\fR\fIOPTIONS\fR" 4
+Configure the running keyboard as specified, if this one misses live\-initramfs behaves as if "keyb=us" was specified. It will be interfered from "locale=" if locale is only 2 lowecase letters as a special case. You could also specify console layout, variant, code, and options (no defaults).
+.IP "\fBlive\-getty\fR" 4
+This changes the auto\-login on virtual terminals to use the (experimental) live\-getty code. With this option set the standard kernel argument "console=" is parsed and if a serial console is specified then live\-getty is used to autologin on the serial console.
.IP "\fB{live\-media|bootfrom}=\fR\fIDEVICE\fR" 4
If you specify one of this two equivalent forms, live\-initramfs will first try to find this device for the "/live" directory where the read\-only root filesystem should reside. If it did not find something usable, the normal scan for block devices is performed.
.IP "\fB{live\-media\-encryption|encryption}=\fR\fITYPE\fR" 4
Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live 2007-05-11 17:32:03 UTC (rev 1466)
+++ dists/trunk/live-initramfs/scripts/live 2007-05-11 19:08:29 UTC (rev 1467)
@@ -32,100 +32,190 @@
parse_cmdline ()
{
- PRESEEDS=
- # looking for casper specifics options as kernel parameters
- for x in $(cat /proc/cmdline); do
- case $x in
- userfullname=*)
- export USERFULLNAME=${x#userfullname=}
- export LIVECONF="changed"
- ;;
- hostname=*)
- export HOSTNAME=${x#hostname=}
- export LIVECONF="changed"
- ;;
- username=*)
- export USERNAME=${x#username=}
- export LIVECONF="changed"
- ;;
- netboot*)
- export NETBOOT=${x#netboot=} ;;
- access=*)
- export ACCESS=${x#access=} ;;
- xdebconf)
- export XDEBCONF="Yes" ;;
- toram)
- export TORAM="Yes" ;;
- todisk=*)
- export TODISK=${x#todisk=} ;;
- showmounts)
- export SHOWMOUNTS="Yes" ;;
- persistent)
- export PERSISTENT="Yes" ;;
- nopersistent)
- export PERSISTENT="" ;;
- ip*)
- STATICIP=${x#ip=}
- if [ "${STATICIP}" == "" ]; then
- STATICIP="frommedia"
+ PRESEEDS=
+
+ for PARAMETER in `cat /proc/cmdline`
+ do
+ case "${PARAMETER}" in
+ access=*)
+ ACCESS="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export ACCESS
+ ;;
+
+ console=*)
+ DEFCONSOLE="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export DEFCONSOLE
+ ;;
+
+ hostname=*)
+ HOSTNAME="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export HOSTNAME
+ ;;
+
+ username=*)
+ USERNAME="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export USERNAME
+ ;;
+
+ userfullname=*)
+ USERFULLNAME="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export USERFULLNAME
+ ;;
+
+ integrity-check)
+ INTEGRITY_CHECK="yes"
+ export INTEGRITY_CHECK
+ ;;
+
+ ip*)
+ STATICIP="`echo ${PARAMETER} | sed 's/.*=//'`"
+
+ if [ -z "${STATICIP}" ]
+ then
+ STATICIP="frommedia"
+ fi
+
+ export STATICIP
+ ;;
+
+ keyb=*|kbd-chooser/method=*)
+ KBD="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export KBD
+ ;;
+
+ klayout=*|console-setup/layoutcode=*)
+ KLAYOUT="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export KLAYOUT
+ ;;
+
+ kvariant=*|console-setup/variantcode=*)
+ KVARIANT="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export KVARIANT
+ ;;
+
+ kmodel=*|console-setup/modelcode=*)
+ KMODEL="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export KMODEL
+ ;;
+
+ koptions=*)
+ KOPTIONS="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export KOPTIONS
+ ;;
+
+ live-getty)
+ LIVEGETTY="1"
+ export LIVEGETTY
+ ;;
+
+ live-media=*|bootfrom=*)
+ LIVEMEDIA="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LIVEMEDIA
+ ;;
+
+ live-media-encryption=*|encryption=*)
+ LIVEMEDIA_ENCRYPTION="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LIVEMEDIA_ENCRYPTION
+ ;;
+
+ live-media-timeout=*)
+ LIVEMEDIA_TIMEOUT="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LIVEMEDIA_TIMEOUT
+ ;;
+
+ live-media-offset=*)
+ LIVEMEDIA_OFFSET="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LIVEMEDIA_OFFSET
+ ;;
+
+ locale=*|debian-installer/locale=*)
+ LOCALE="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LOCALE
+ ;;
+
+ module=*)
+ MODULE="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export MODULE
+ ;;
+
+ netboot=*)
+ NETBOOT="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export NETBOOT
+ ;;
+
+ persistent)
+ PERSISTENT="Yes"
+ export PERSISTENT
+ ;;
+
+ nopersistent)
+ PERSISTENT=""
+ export PERSISTENT
+ ;;
+
+ showmounts)
+ SHOWMOUNTS="Yes"
+ export SHOWMOUNTS
+ ;;
+
+ swapoff)
+ SWAPOFF="Yes"
+ export SWAPOFF
+ ;;
+
+ todisk=*)
+ TODISK="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export TODISK
+ ;;
+
+ toram)
+ TORAM="Yes"
+ export TORAM
+ ;;
+
+ preseed/file=*|file=*)
+ LOCATION="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export LOCATION
+ ;;
+
+ */*=*)
+ # FIXME
+ question="${x%%=*}"
+ value="${x#*=}"
+ PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
+ #export question value PRESEEDS
+ ;;
+
+ xdebconf)
+ XDEBCONF="Yes"
+ export XDEBCONF
+ ;;
+
+ xvideomode=*)
+ XVIDEOMODE="`echo ${PARAMETER} | sed 's/.*=//'`"
+ export XVIDEOMODE
+ ;;
+ esac
+ done
+
+ # sort of compatibility with netboot.h from linux docs
+ if [ -z "${NETBOOT}" ]
+ then
+ if [ "${ROOT}" = "/dev/nfs" ]
+ then
+ NETBOOT="nfs"
+ export NETBOOT
+ elif [ "${ROOT}" = "/dev/cifs" ]
+ then
+ NETBOOT="cifs"
+ export NETBOOT
fi
- export STATICIP ;;
- integrity-check)
- export MD5CHECK="Yes" ;;
- liver-getty)
- export CASPERGETTY=1 ;;
- bootfrom=*|live-media=*)
- export LIVEMEDIA=${x#*=} ;;
- live-media-encryption=*|encryption=*)
- export LIVEMEDIA_ENCRYPTION=${x#*=} ;;
- live-media-timeout=*)
- export LIVEMEDIA_TIMEOUT=${x#live-media-timeout=} ;;
- live-media-offset=*)
- export LIVEMEDIA_OFFSET=${x#live-media-offset=} ;;
- locale=*|debian-installer/locale=*)
- export LOCALE=${x#*=} ;;
- keyb=*|kbd-chooser/method=*)
- export KBD=${x#*=} ;;
- klayout=*|console-setup/layoutcode=*)
- export KLAYOUT=${x#*=} ;;
- koptions=*)
- export KOPTIONS=${x#koptions=} ;;
- kvariant=*|console-setup/variantcode=*)
- export KVARIANT=${x#*=} ;;
- kmodel=*|console-setup/modelcode=*)
- export KMODEL=${x#*=} ;;
- xvideomode=*)
- export XVIDEOMODE=${x#xvideomode=} ;;
- module=*)
- export MODULE=${x#module=} ;;
- preseed/file=*|file=*)
- export LOCATION="${x#*=}" ;;
- swapoff)
- export SWAPOFF="Yes" ;;
- */*=*)
- question="${x%%=*}"
- value="${x#*=}"
- PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
- ;;
- console=*)
- export DEFCONSOLE="${x#*=}" ;;
- esac
- done
+ fi
- # sort of compatibility with netboot.h from linux docs
- if [ -z "${NETBOOT}" ]; then
- if [ "${ROOT}" == "/dev/nfs" ]; then
- NETBOOT="nfs"
- export NETBOOT
- elif [ "${ROOT}" == "/dev/cifs" ]; then
- NETBOOT="cifs"
- export NETBOOT
+ if [ -z "${MODULE}" ]
+ then
+ MODULE="order"
fi
- fi
-
- if [ -z "${MODULE}" ]; then
- MODULE=order
- fi
}
is_casper_path() {
Modified: dists/trunk/live-initramfs/scripts/live-bottom/00md5check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/00md5check 2007-05-11 17:32:03 UTC (rev 1466)
+++ dists/trunk/live-initramfs/scripts/live-bottom/00md5check 2007-05-11 19:08:29 UTC (rev 1467)
@@ -20,7 +20,7 @@
# md5check script
-if [ -n "${MD5CHECK}" ]
+if [ -n "${INTEGRITY_CHECK}" ]
then
live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
fi
Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 17:32:03 UTC (rev 1466)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 19:08:29 UTC (rev 1467)
@@ -30,7 +30,7 @@
if [ -n "$USERNAME" ]
then
- if [ -n "${CASPERGETTY}" ]
+ if [ -n "${LIVEGETTY}" ]
then
if echo "${DEFCONSOLE}" | grep -qs ttyS
then
More information about the Debian-live-changes
mailing list