[SCM] live-config branch, debian-next, updated. debian/3.0_a14-1-6-g5e7991d
Daniel Baumann
daniel at debian.org
Mon Dec 6 15:58:30 UTC 2010
The following commit has been merged in the debian-next branch:
commit 5e7991d5c5a0ee3582e9eb9050fdf884d61cb9bd
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Dec 6 16:58:02 2010 +0100
Making plugins self-contained.
diff --git a/examples/live-config-foobar/scripts/900-foobar b/examples/live-config-foobar/scripts/900-foobar
index 189992a..9f9104a 100755
--- a/examples/live-config-foobar/scripts/900-foobar
+++ b/examples/live-config-foobar/scripts/900-foobar
@@ -19,13 +19,9 @@ Foobar ()
echo -n " foobar"
- Configure_foobar
-}
-
-Configure_foobar ()
-{
# Boot parameters can be acted up either this way...
- if ! grep -qs "live-helper.foobar" /proc/cmdline
+ if ! grep -qs "live-config.foobar" /proc/cmdline && \
+ ! grep -qs "foobar" /proc/cmdline
then
return
fi
@@ -34,12 +30,17 @@ Configure_foobar ()
for _PARAMETER in $(cat /proc/cmdline)
do
case "${_PARAMETER}" in
- live-config.foobar=*)
- LIVE_FOOBAR="${_PARAMETER#live-config.foobar=}"
+ live-config.foobar=*|foobar=*)
+ LIVE_FOOBAR="${_PARAMETER#*foobar=}"
;;
esac
done
+ Configure_foobar
+}
+
+Configure_foobar ()
+{
# Configuring foobar
sleep 1
diff --git a/scripts/config.sh b/scripts/config.sh
index 03783b1..2e20ef1 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -27,9 +27,11 @@ LIVE_HOSTNAME="debian"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Debian Live user"
+_CMDLINE="$(cat /proc/cmdline)"
+
Cmdline ()
{
- for _PARAMETER in $(cat /proc/cmdline)
+ for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
live-config|config)
@@ -53,74 +55,6 @@ Cmdline ()
LIVE_NOCONFIGS="${_PARAMETER#*noconfig=}"
;;
- # 001-hostname
- live-config.hostname=*|hostname=*)
- LIVE_HOSTNAME="${_PARAMETER#*hostname=}"
- ;;
-
- # 002-user-setup
- live-config.username=*|username=*)
- LIVE_USERNAME="${_PARAMETER#*username=}"
- ;;
-
- live-config.user-fullname=*|user-fullname=*)
- LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}"
- ;;
-
- # 004-locales
- live-config.locales=*|locales=*)
- LIVE_LOCALES="${_PARAMETER#*locales=}"
- ;;
-
- # 005-tzdata
- live-config.timezone=*|timezone=*)
- LIVE_TIMEZONE="${_PARAMETER#*timezone=}"
- ;;
-
- live-config.utc=*|utc=*)
- LIVE_UTC="${_PARAMETER#*utc=}"
- ;;
-
- # 012-console-setup, 013-keyboard-configuration
- live-config.keyboard-model=*|keyboard-model=*)
- LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
- ;;
-
- live-config.keyboard-layouts=*|keyboard-layouts=*)
- LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
- ;;
-
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
- ;;
-
- live-config.keyboard-options=*|keyboard-options=*)
- LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
- ;;
-
- # 014-sysv-rc
- live-config.sysv-rc=*|sysv-rc=*)
- LIVE_SYSV_RC="${_PARAMETER#*sysv-rc=}"
- ;;
-
- # 116-xserver-xorg
- live-config.xorg-xsession-manager=*|x-session-manager=*)
- LIVE_X_SESSION_MANAGER="${_PARAMETER#*x-session-manager=}"
- ;;
-
- live-config.xorg-driver=*|xorg-driver=*)
- LIVE_XORG_DRIVER="${_PARAMETER#*xorg-driver=}"
- ;;
-
- live-config.xorg-resolution=*|xorg-resolution=*)
- LIVE_XORG_RESOLUTION="${_PARAMETER#*xorg-resolution=}"
- ;;
-
- # 999-hooks
- live-config.hooks=*|hooks=*)
- LIVE_HOOKS="${_PARAMETER#*hooks=}"
- ;;
-
# Shortcuts
live-config.noroot|noroot)
# Disable root access, no matter what mechanism
diff --git a/scripts/config/001-hostname b/scripts/config/001-hostname
index 872f6a3..1c4550f 100755
--- a/scripts/config/001-hostname
+++ b/scripts/config/001-hostname
@@ -19,6 +19,16 @@ Hostname ()
echo -n " hostname"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.hostname=*|hostname=*)
+ LIVE_HOSTNAME="${_PARAMETER#*hostname=}"
+ ;;
+ esac
+ done
+
Configure_hostname
}
diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index 867040b..f88499e 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -19,6 +19,21 @@ User_setup ()
echo -n " user-setup"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+
+ live-config.user-fullname=*|user-fullname=*)
+ LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}"
+ ;;
+ esac
+ done
+
+
Configure_user_setup
}
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index 57d9dd6..af05ed1 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -19,6 +19,15 @@ Locales ()
echo -n " locales"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.locales=*|locales=*)
+ LIVE_LOCALES="${_PARAMETER#*locales=}"
+ ;;
+ esac
+ done
+
Configure_locales
}
diff --git a/scripts/config/005-tzdata b/scripts/config/005-tzdata
index f2f1c9b..25ceb0d 100755
--- a/scripts/config/005-tzdata
+++ b/scripts/config/005-tzdata
@@ -19,6 +19,19 @@ Tzdata ()
echo -n " tzdata"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.timezone=*|timezone=*)
+ LIVE_TIMEZONE="${_PARAMETER#*timezone=}"
+ ;;
+
+ live-config.utc=*|utc=*)
+ LIVE_UTC="${_PARAMETER#*utc=}"
+ ;;
+ esac
+ done
+
Configure_tzdata
}
diff --git a/scripts/config/013-keyboard-configuration b/scripts/config/013-keyboard-configuration
index 06279b7..1fab4f1 100755
--- a/scripts/config/013-keyboard-configuration
+++ b/scripts/config/013-keyboard-configuration
@@ -19,6 +19,27 @@ Keyboard_configuration ()
echo -n " keyboard-configuration"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.keyboard-model=*|keyboard-model=*)
+ LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
+ ;;
+
+ live-config.keyboard-layouts=*|keyboard-layouts=*)
+ LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
+ ;;
+
+ live-config.keyboard-variant=*|keyboard-variant=*)
+ LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ ;;
+
+ live-config.keyboard-options=*|keyboard-options=*)
+ LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
+ ;;
+ esac
+ done
+
Configure_keyboard_configuration
}
diff --git a/scripts/config/015-sysv-rc b/scripts/config/015-sysv-rc
index 2038c52..380c8a0 100755
--- a/scripts/config/015-sysv-rc
+++ b/scripts/config/015-sysv-rc
@@ -19,6 +19,15 @@ Sysv_rc ()
echo -n " sysv-rc"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.sysv-rc=*|sysv-rc=*)
+ LIVE_SYSV_RC="${_PARAMETER#*sysv-rc=}"
+ ;;
+ esac
+ done
+
Configure_sysv_rc
}
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index ffdc789..ab33189 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -19,6 +19,23 @@ Xserver_xorg ()
echo -n " xserver-xorg"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.xorg-xsession-manager=*|x-session-manager=*)
+ LIVE_X_SESSION_MANAGER="${_PARAMETER#*x-session-manager=}"
+ ;;
+
+ live-config.xorg-driver=*|xorg-driver=*)
+ LIVE_XORG_DRIVER="${_PARAMETER#*xorg-driver=}"
+ ;;
+
+ live-config.xorg-resolution=*|xorg-resolution=*)
+ LIVE_XORG_RESOLUTION="${_PARAMETER#*xorg-resolution=}"
+ ;;
+ esac
+ done
+
Configure_xserver_xorg
}
diff --git a/scripts/config/999-hooks b/scripts/config/999-hooks
index 2aa62e9..26a675d 100755
--- a/scripts/config/999-hooks
+++ b/scripts/config/999-hooks
@@ -17,6 +17,15 @@ Hooks ()
echo -n " hooks"
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.hooks=*|hooks=*)
+ LIVE_HOOKS="${_PARAMETER#*hooks=}"
+ ;;
+ esac
+ done
+
Process_hooks
}
--
live-config
More information about the debian-live-changes
mailing list