[SCM] live-config branch, upstream, updated. upstream/3.0_a29-1-g1e61083
Daniel Baumann
daniel at debian.org
Fri Oct 28 10:30:51 UTC 2011
The following commit has been merged in the upstream branch:
commit 1e61083a841d24afc275d60cbe9f8e222bf715e8
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Oct 28 12:30:24 2011 +0200
Adding upstream version 3.0~a30.
diff --git a/VERSION b/VERSION
index a2832c5..2005623 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a29
+3.0~a30
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 5749cd8..c277605 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27.10.2011 3.0~a29 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 28.10.2011 3.0~a30 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 92f68b1..3356ae9 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2011\-10\-27 3.0~a29 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-10\-28 3.0~a30 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 286b663..cc53de8 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27.10.2011 3.0~a29 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 28.10.2011 3.0~a30 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index f1b7ab5..892dde4 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27.10.2011 3.0~a29 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 28.10.2011 3.0~a30 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 46961fe..ca3c47a 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27.10.2011 3.0~a29 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 28.10.2011 3.0~a30 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index a419516..eb035cd 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -1,11 +1,11 @@
# German translations for live-config package
-# 2010 Daniel Baumann <daniel at debian.org>
+# 2010-2011 Daniel Baumann <daniel at debian.org>
# This file is distributed under the same license as the live-config package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a29\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"Project-Id-Version: live-config 3.0~a30\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
-msgstr "27.10.2011"
+msgid "2011-10-28"
+msgstr "28.10.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
-msgstr "3.0~a29"
+msgid "3.0~a30"
+msgstr "3.0~a30"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index b87975f..398091e 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a29\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"Project-Id-Version: live-config 3.0~a30\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: 2011-10-04 15:28+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
-msgstr "27.10.2011"
+msgid "2011-10-28"
+msgstr "28.10.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
-msgstr "3.0~a29"
+msgid "3.0~a30"
+msgstr "3.0~a30"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 154b902..8932448 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a29\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"Project-Id-Version: live-config 3.0~a30\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
-msgstr "27.10.2011"
+msgid "2011-10-28"
+msgstr "28.10.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
-msgstr "3.0~a29"
+msgid "3.0~a30"
+msgstr "3.0~a30"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index e8dd520..6e30c2c 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a29\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"Project-Id-Version: live-config 3.0~a30\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: 2011-01-20 22:31+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
-msgstr "27.10.2011"
+msgid "2011-10-28"
+msgstr "28.10.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
-msgstr "3.0~a29"
+msgid "3.0~a30"
+msgstr "3.0~a30"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 1e47dd9..6648efc 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a29\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"Project-Id-Version: live-config 3.0~a30\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
-msgstr "27-08-2011"
+msgid "2011-10-28"
+msgstr "28-08-2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
-msgstr "3.0~a29"
+msgid "3.0~a30"
+msgstr "3.0~a30"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index fc78048..a28b8be 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2011-10-27 21:43+0300\n"
+"POT-Creation-Date: 2011-10-28 12:27+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-10-27"
+msgid "2011-10-28"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a29"
+msgid "3.0~a30"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 0cf20f7..9dc98eb 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27\-08\-2011 3.0~a29 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 28\-08\-2011 3.0~a30 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index 47e9d01..a8b23db 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -23,13 +23,13 @@ User_setup ()
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=}"
;;
+
+ live-config.username=*|username=*)
+ LIVE_USERNAME="${_PARAMETER#*username=}"
+ ;;
esac
done
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..2442b34 100755
--- a/scripts/config/015-keyboard-configuration
+++ b/scripts/config/015-keyboard-configuration
@@ -19,24 +19,25 @@ Keyboard_configuration ()
echo -n " keyboard-configuration"
+ # Reading kernel command line
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-model=*|keyboard-model=*)
+ LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
;;
live-config.keyboard-options=*|keyboard-options=*)
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
;;
+
+ live-config.keyboard-variant=*|keyboard-variant=*)
+ LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ ;;
esac
done
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..0149dcf 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
@@ -35,9 +36,9 @@ Configure_sysv_rc ()
{
if [ -n "${LIVE_SYSV_RC}" ]
then
- for SERVICE in $(echo ${LIVE_SYSV_RC} | sed -e 's|,| |g')
+ for _SERVICE in $(echo ${LIVE_SYSV_RC} | sed -e 's|,| |g')
do
- update-rc.d -f ${SERVICE} remove | \
+ update-rc.d -f ${_SERVICE} remove | \
grep -v "update-rc.d: using dependency based boot sequencing" || true
done
fi
diff --git a/scripts/config/018-upstart b/scripts/config/018-upstart
index 1916805..e4fb96d 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
}
@@ -28,9 +38,9 @@ Configure_upstart ()
do
_TTY="$(basename ${_FILE} .conf)"
- # mingetty has autologin support
if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
then
+ # mingetty has autologin support
sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"
else
# substitute getty with a direct login
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..3d09a12 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-layouts=*|keyboard-layouts=*)
+ LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
+ ;;
+
+ live-config.keyboard-model=*|keyboard-model=*)
+ LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
+ ;;
+
+ live-config.keyboard-options=*|keyboard-options=*)
+ LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
+ ;;
+
+ live-config.keyboard-variant=*|keyboard-variant=*)
+ LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ ;;
+
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