[SCM] live-config branch, debian-next, updated. debian/3.0_a29-1-4-gb6fcfcb
Daniel Baumann
daniel at debian.org
Fri Oct 28 10:27:03 UTC 2011
The following commit has been merged in the debian-next branch:
commit b8782163143a92421f0b1787cce5ee2ec5180796
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Oct 28 12:22:35 2011 +0200
Adding required parsing for the respective boot parameters in all config scripts so that every script is self-contained (Closes: #646824).
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index cdbb544..d4df59f 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -19,6 +19,7 @@ Locales ()
echo -n " locales"
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
diff --git a/scripts/config/005-locales-all b/scripts/config/005-locales-all
index 793be69..1b6bf32 100755
--- a/scripts/config/005-locales-all
+++ b/scripts/config/005-locales-all
@@ -19,6 +19,7 @@ Locales_all ()
echo -n " locales-all"
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
diff --git a/scripts/config/006-tzdata b/scripts/config/006-tzdata
index be7ae27..01552fd 100755
--- a/scripts/config/006-tzdata
+++ b/scripts/config/006-tzdata
@@ -19,6 +19,7 @@ Tzdata ()
echo -n " tzdata"
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
diff --git a/scripts/config/007-gdm b/scripts/config/007-gdm
index 2d9c753..002a3aa 100755
--- a/scripts/config/007-gdm
+++ b/scripts/config/007-gdm
@@ -27,6 +27,16 @@ Gdm ()
echo -n " gdm"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_gdm
}
diff --git a/scripts/config/008-gdm3 b/scripts/config/008-gdm3
index 6671441..e2324c1 100755
--- a/scripts/config/008-gdm3
+++ b/scripts/config/008-gdm3
@@ -27,6 +27,16 @@ Gdm3 ()
echo -n " gdm3"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_gdm3
}
diff --git a/scripts/config/009-kdm b/scripts/config/009-kdm
index 6c20966..6d936d8 100755
--- a/scripts/config/009-kdm
+++ b/scripts/config/009-kdm
@@ -27,6 +27,16 @@ Kdm ()
echo -n " kdm"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_kdm
}
diff --git a/scripts/config/010-lightdm b/scripts/config/010-lightdm
index 719931d..f5ee19f 100755
--- a/scripts/config/010-lightdm
+++ b/scripts/config/010-lightdm
@@ -27,6 +27,16 @@ Lightdm ()
echo -n " lightdm"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_lightdm
}
diff --git a/scripts/config/011-lxdm b/scripts/config/011-lxdm
index 04946a6..241ebb2 100755
--- a/scripts/config/011-lxdm
+++ b/scripts/config/011-lxdm
@@ -27,6 +27,16 @@ Lxdm ()
echo -n " lxdm"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_lxdm
}
diff --git a/scripts/config/012-nodm b/scripts/config/012-nodm
index 566fa37..e010ede 100755
--- a/scripts/config/012-nodm
+++ b/scripts/config/012-nodm
@@ -27,6 +27,16 @@ Nodm ()
echo -n " nodm"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_nodm
}
diff --git a/scripts/config/013-slim b/scripts/config/013-slim
index 5365555..813e536 100755
--- a/scripts/config/013-slim
+++ b/scripts/config/013-slim
@@ -27,6 +27,16 @@ Slim ()
echo -n " slim"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_slim
}
diff --git a/scripts/config/015-keyboard-configuration b/scripts/config/015-keyboard-configuration
index d781eec..7c93d05 100755
--- a/scripts/config/015-keyboard-configuration
+++ b/scripts/config/015-keyboard-configuration
@@ -19,6 +19,7 @@ Keyboard_configuration ()
echo -n " keyboard-configuration"
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
diff --git a/scripts/config/016-sysvinit b/scripts/config/016-sysvinit
index 581a15c..6db8aa1 100755
--- a/scripts/config/016-sysvinit
+++ b/scripts/config/016-sysvinit
@@ -19,6 +19,16 @@ Sysvinit ()
echo -n " sysvinit"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_sysvinit
}
diff --git a/scripts/config/017-sysv-rc b/scripts/config/017-sysv-rc
index 8191782..7dc9765 100755
--- a/scripts/config/017-sysv-rc
+++ b/scripts/config/017-sysv-rc
@@ -19,6 +19,7 @@ Sysv_rc ()
echo -n " sysv-rc"
+ # Reading kernel command line
for _PARAMETER in ${_CMDLINE}
do
case "${_PARAMETER}" in
diff --git a/scripts/config/018-upstart b/scripts/config/018-upstart
index 1916805..019b04d 100755
--- a/scripts/config/018-upstart
+++ b/scripts/config/018-upstart
@@ -19,6 +19,16 @@ Upstart ()
echo -n " upstart"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_upstart
}
diff --git a/scripts/config/102-gnome-panel-data b/scripts/config/102-gnome-panel-data
index 80a9a04..d5801e9 100755
--- a/scripts/config/102-gnome-panel-data
+++ b/scripts/config/102-gnome-panel-data
@@ -19,6 +19,16 @@ Gnome_panel_data ()
echo -n " gnome-panel-data"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_gnome_panel_data
}
diff --git a/scripts/config/103-gnome-power-manager b/scripts/config/103-gnome-power-manager
index 0214b17..200e97e 100755
--- a/scripts/config/103-gnome-power-manager
+++ b/scripts/config/103-gnome-power-manager
@@ -19,6 +19,16 @@ Gnome_power_manager ()
echo -n " gnome-screensaver"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_gnome_power_manager
}
diff --git a/scripts/config/104-gnome-screensaver b/scripts/config/104-gnome-screensaver
index 2f229fa..7be3251 100755
--- a/scripts/config/104-gnome-screensaver
+++ b/scripts/config/104-gnome-screensaver
@@ -19,6 +19,16 @@ Gnome_screensaver ()
echo -n " gnome-screesnaver"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_gnome_screensaver
}
diff --git a/scripts/config/106-kaboom b/scripts/config/106-kaboom
index 34638e1..a2abf15 100755
--- a/scripts/config/106-kaboom
+++ b/scripts/config/106-kaboom
@@ -19,6 +19,16 @@ Kaboom ()
echo -n " kaboom"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_kaboom
}
diff --git a/scripts/config/107-kde-services b/scripts/config/107-kde-services
index 2a45497..14d5e41 100755
--- a/scripts/config/107-kde-services
+++ b/scripts/config/107-kde-services
@@ -20,6 +20,20 @@ Kde_services ()
echo -n " kde-services"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.keyboard-layouts=*|keyboard-layouts=*)
+ LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
+ ;;
+
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_kde_services
}
diff --git a/scripts/config/108-debian-installer-launcher b/scripts/config/108-debian-installer-launcher
index c9173f5..e605a9f 100755
--- a/scripts/config/108-debian-installer-launcher
+++ b/scripts/config/108-debian-installer-launcher
@@ -19,6 +19,16 @@ Debian_installer_launcher ()
echo -n " debian-installer-launcher"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_debian_installer_launcher
}
diff --git a/scripts/config/110-policykit b/scripts/config/110-policykit
index 36e9748..f86a9f4 100755
--- a/scripts/config/110-policykit
+++ b/scripts/config/110-policykit
@@ -19,6 +19,16 @@ Policykit ()
echo -n " policykit"
+ # Reading kernel command line
+ for _PARAMETER in ${_CMDLINE}
+ do
+ case "${_PARAMETER}" in
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
+ esac
+ done
+
Configure_policykit
}
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index d7a2445..0a26855 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -22,6 +22,22 @@ Xserver_xorg ()
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=}"
+ ;;
+
live-config.xorg-xsession-manager=*|x-session-manager=*)
LIVE_X_SESSION_MANAGER="${_PARAMETER#*x-session-manager=}"
;;
--
live-config
More information about the debian-live-changes
mailing list