[SCM] live-config branch, debian, updated. debian/2.0_a5-1-15-g7e5167f
Daniel Baumann
daniel at debian.org
Tue Jun 8 04:09:06 UTC 2010
The following commit has been merged in the debian branch:
commit dd10f7ed6dc642fc55435a3285eae867e9164df7
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 7 12:00:03 2010 +0200
Adding keyboard configuration scripts.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 26ec057..a99b788 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 05.06.2010 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 07.06.2010 2.0~a5 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -74,6 +74,18 @@ Ermöglicht die Zeitzone des Systems einzustellen, zum Beispiel
.IP \fBlive\-config.utc\fP=\fByes\fP|no 4
Ermöglicht zu bestimmen, ob das System davon ausgehen soll, dass die
Hardwareuhr auf UTC gestellt ist oder nicht. Der Standard ist 'yes'.
+.IP \fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP 4
+Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP 4
+Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP 4
+Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP 4
+Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
+gesetzt.
.IP "\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
Ermöglicht eine oder mehrere beliebige Dateien herunterzuladen und
auszuführen. Die URLs müssen durch wget aufösbar sein und es müssen alle
@@ -138,6 +150,18 @@ Diese Variable enspricht dem '\fBlive\-config.timezone\fP=\fIZEITZONE\fP'
Parameter.
.IP \fBLIVE_UTC\fP=\fByes\fP|no 4
Diese Variable enspricht dem '\fBlive\-config.utc\fP=\fByes\fP|no' Parameter.
+.IP \fBLIVE_KEYBOARD_MODEL\fP=\fIKEYBOARD_MODEL\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_LAYOUT\fP=\fIKEYBOARD_LAYOUT\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fIKEYBOARD_VARIANT\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIKEYBOARD_OPTIONS\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
.IP "\fBLIVE_HOOK\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
Diese Variable enspricht dem '\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP|
\&... |\fIURLn\fP' Parameter.
@@ -191,6 +215,8 @@ konfiguriert Autologin in kdm.
konfiguriert Autologin in lxdm.
.IP \fBnodm\fP 4
konfiguriert Autologin in nodm.
+.IP "\fBconsole\-common\fP, console\-setup (lenny), \fBkeyboard\-configuration\fP (squeeze and newer)" 4
+konfiguriert die Tastatur.
.IP \fBapport\fP 4
aktiviert apport.
.IP \fBgnome\-panel\-data\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index f81cf35..eb5491b 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 2010\-06\-05 2.0~a5 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-07 2.0~a5 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -44,6 +44,14 @@ Allows to set the locale of the system, e.g. 'de_CH.UTF\-8'. The default is 'en_
Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is 'UTC'.
.IP "\fBlive-config.utc\fR=\fByes\fR|no" 4
Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
+.IP "\fBlive-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
+Allows to change the keyboard model. There is no default value set.
+.IP "\fBlive-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\fR" 4
+Allows to change the keyboard layout. There is no default value set.
+.IP "\fBlive-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
+Allows to change the keyboard variant. There is no default value set.
+.IP "\fBlive-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
+Allows to change the keyboard options. There are no default value set.
.IP "\fBlive-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed.
@@ -78,6 +86,14 @@ This variable equals the '\fBlive\-config.locales\fR=\fILOCALE\fR' parameter.
This variable equals the '\fBlive\-config.timezone\fR=\fITIMEZONE\fR' parameter.
.IP "\fBLIVE_UTC\fR=\fByes\fR|no" 4
This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
+.IP "\fBLIVE_KEYBOARD_MODEL\fR=\fIKEYBOARD_MODEL\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_LAYOUT\fR=\fIKEYBOARD_LAYOUT\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_VARIANT\fR=\fIKEYBOARD_VARIANT\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_OPTIONS\fR=\fIKEYBOARD_OPTIONS\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR' parameter.
.IP "\fBLIVE_HOOK\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
This variable equals the '\fBlive\-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
@@ -117,6 +133,8 @@ configures autologin in kdm.
configures autologin in lxdm.
.IP "\fBnodm\fR" 4
configures autologin in nodm.
+.IP "\fBconsole-common\fR, console-setup\fR (lenny), \fBkeyboard\-configuration\fR (squeeze and newer)" 4
+configures the keyboard.
.IP "\fBapport\fR" 4
enables apport.
.IP "\fBgnome-panel-data\fR" 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 8b8d05f..1c3dff5 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a5\n"
-"POT-Creation-Date: 2010-06-05 16:50+0300\n"
+"POT-Creation-Date: 2010-06-07 11:47+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,8 +24,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-05"
-msgstr "05.06.2010"
+msgid "2010-06-07"
+msgstr "07.06.2010"
#. type: TH
#: en/live-config.7:9
@@ -275,11 +275,63 @@ msgstr ""
#. type: IP
#: en/live-config.7:47
#, no-wrap
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
+msgstr "B<live-config.keyboard-model>=I<TASTATUR_MODELL>"
+
+#. type: Plain text
+#: en/live-config.7:49
+msgid "Allows to change the keyboard model. There is no default value set."
+msgstr ""
+"Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:49
+#, no-wrap
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgstr "B<live-config.keyboard-layout>=I<TASTATUR_LAYOUT>"
+
+#. type: Plain text
+#: en/live-config.7:51
+msgid "Allows to change the keyboard layout. There is no default value set."
+msgstr ""
+"Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:51
+#, no-wrap
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgstr "B<live-config.keyboard-variant>=I<TASTATUR_VARIANTE>"
+
+#. type: Plain text
+#: en/live-config.7:53
+msgid "Allows to change the keyboard variant. There is no default value set."
+msgstr ""
+"Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:53
+#, no-wrap
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgstr "B<live-config.keyboard-options>=I<TASTATUR_OPTIONEN>"
+
+#. type: Plain text
+#: en/live-config.7:55
+msgid "Allows to change the keyboard options. There are no default value set."
+msgstr ""
+"Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:55
+#, no-wrap
msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<live-config.hook>=I<URL1>|I<URL2>| ...|I<URLn>"
#. type: Plain text
-#: en/live-config.7:49
+#: en/live-config.7:57
msgid ""
"Allows to fetch and execute one or more arbitrary files. Note that the URLs "
"must be fetchable by wget, and that the files needs their dependencies, if "
@@ -293,13 +345,13 @@ msgstr ""
"dem System installiert sein."
#. type: SS
-#: en/live-config.7:50
+#: en/live-config.7:58
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:52
+#: en/live-config.7:60
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -311,13 +363,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:53
+#: en/live-config.7:61
#, no-wrap
msgid "B<live-config.noroot>"
msgstr "B<live-config.noroot>"
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:63
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -326,13 +378,13 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:63
#, no-wrap
msgid "B<live-config.noxlogin>"
msgstr "B<live-config.noxlogin>"
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:65
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -341,13 +393,13 @@ msgstr ""
"den automatischen tty Login."
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:66
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:68
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -363,7 +415,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:70
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
@@ -378,7 +430,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:72
msgid ""
"Although the configuration files placed in the conf.d directories do not "
"require a particular name or suffix, it's suggest for consistency to either "
@@ -394,13 +446,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:73
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_CONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:75
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -409,13 +461,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:75
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_NOCONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:77
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -424,13 +476,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:77
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:79
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -438,13 +490,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:79
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -452,13 +504,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr "B<LIVE_USER_FULLNAME>=\"I<VOLLER BENUTZERNAME\">"
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -467,50 +519,110 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:85
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.locales>=I<GEBIETSSCHEMA>' "
"Parameter."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.timezone>=I<ZEITZONE>' Parameter."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:89
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr "Diese Variable enspricht dem 'B<live-config.utc>=B<yes>|no' Parameter."
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:89
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:91
+msgid ""
+"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
+"parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"model>=I<TASTATUR_MODELL>' Parameter."
+
+#. type: IP
+#: en/live-config.7:91
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:93
+msgid ""
+"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
+"parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"layout>=I<TASTATUR_LAYOUT>' Parameter."
+
+#. type: IP
+#: en/live-config.7:93
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:95
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"variant>=I<KEYBOARD_VARIANT>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"variant>=I<TASTATUR_VARIANTE>' Parameter."
+
+#. type: IP
+#: en/live-config.7:95
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:97
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"options>=I<KEYBOARD_OPTIONS>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"options>=I<TASTATUR_OPTIONEN>' Parameter."
+
+#. type: IP
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
"parameter."
@@ -519,13 +631,13 @@ msgstr ""
"I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:100
#, no-wrap
msgid "CUSTOMIZATION"
msgstr "ANPASSUNG"
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:102
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
@@ -534,13 +646,13 @@ msgstr ""
"oder lokale Verwendung."
#. type: SS
-#: en/live-config.7:87
+#: en/live-config.7:103
#, no-wrap
msgid "Adding new config scripts"
msgstr "Hinzufügen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:105
msgid ""
"Downstream projects can put their scripts into /lib/live/config and don't "
"need to do anything else, the scripts will be called automatically during "
@@ -551,7 +663,7 @@ msgstr ""
"Startens ausgeführt."
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:107
msgid ""
"The scripts are best put into an own debian package. A sample package "
"containing an example script can be found in /usr/share/doc/live-config/"
@@ -562,13 +674,13 @@ msgstr ""
"examples."
#. type: SS
-#: en/live-config.7:92
+#: en/live-config.7:108
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Entfernen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:94
+#: en/live-config.7:110
msgid ""
"It's not really possible to remove scripts itself in a sane way yet without "
"requiring to ship a locally modified B<live-config> package. However, the "
@@ -586,7 +698,7 @@ msgstr ""
"werden, siehe oben."
#. type: Plain text
-#: en/live-config.7:96
+#: en/live-config.7:112
msgid ""
"The configuration files for the live system itself are best put into an own "
"debian package. A sample package containing an example configuration can be "
@@ -597,180 +709,191 @@ msgstr ""
"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
#. type: SH
-#: en/live-config.7:97
+#: en/live-config.7:113
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:115
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr "B<live-config> enthält derzeit folgende Skripte in /lib/live/config."
#. type: IP
-#: en/live-config.7:100
+#: en/live-config.7:116
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:102
+#: en/live-config.7:118
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:102
+#: en/live-config.7:118
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:104
+#: en/live-config.7:120
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:104
+#: en/live-config.7:120
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:106
+#: en/live-config.7:122
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:106
+#: en/live-config.7:122
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:108
+#: en/live-config.7:124
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:108
+#: en/live-config.7:124
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:110
+#: en/live-config.7:126
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:110
+#: en/live-config.7:126
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:128
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:112
+#: en/live-config.7:128
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:130
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:114
+#: en/live-config.7:130
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:116
+#: en/live-config.7:132
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:116
+#: en/live-config.7:132
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:118
+#: en/live-config.7:134
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:118
+#: en/live-config.7:134
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:136
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:120
+#: en/live-config.7:136
+#, no-wrap
+msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:138
+msgid "configures the keyboard."
+msgstr "konfiguriert die Tastatur."
+
+#. type: IP
+#: en/live-config.7:138
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:140
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:122
+#: en/live-config.7:140
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:142
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:124
+#: en/live-config.7:142
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:126
+#: en/live-config.7:144
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:126
+#: en/live-config.7:144
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:146
msgid "disables the screensaver locking the screen."
msgstr ""
"schaltet das Sperren des Bildschirmes während der Bildschirmschoner läuft ab."
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:146
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:148
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -778,101 +901,101 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:148
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:150
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:150
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:152
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:152
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:154
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:154
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:156
msgid "adds live-installer-launcher on users desktop."
msgstr "fügt live-installer-launcher auf dem Benutzer Desktop hinzu."
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:156
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:158
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:158
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:160
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:160
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:162
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:162
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:164
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:164
#, no-wrap
msgid "B<hook>"
msgstr "B<hook>"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:166
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -881,77 +1004,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:149
+#: en/live-config.7:167
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:168
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:151
+#: en/live-config.7:169
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:170
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:153
+#: en/live-config.7:171
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:172
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:155
+#: en/live-config.7:173
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:174
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:158
+#: en/live-config.7:176
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:178
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:180
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:163
+#: en/live-config.7:181
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:165
+#: en/live-config.7:183
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -962,13 +1085,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:166
+#: en/live-config.7:184
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:186
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -982,13 +1105,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:169
+#: en/live-config.7:187
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:188
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 0fd4e08..5a8c97a 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: 2010-06-05 16:50+0300\n"
+"POT-Creation-Date: 2010-06-07 11:47+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"
@@ -24,7 +24,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-05"
+msgid "2010-06-07"
msgstr ""
#. type: TH
@@ -237,11 +237,55 @@ msgstr ""
#. type: IP
#: en/live-config.7:47
#, no-wrap
-msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
#: en/live-config.7:49
+msgid "Allows to change the keyboard model. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:49
+#, no-wrap
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:51
+msgid "Allows to change the keyboard layout. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:51
+#, no-wrap
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:53
+msgid "Allows to change the keyboard variant. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:53
+#, no-wrap
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:55
+msgid "Allows to change the keyboard options. There are no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:55
+#, no-wrap
+msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:57
msgid ""
"Allows to fetch and execute one or more arbitrary files. Note that the URLs "
"must be fetchable by wget, and that the files needs their dependencies, if "
@@ -250,13 +294,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:50
+#: en/live-config.7:58
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:52
+#: en/live-config.7:60
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -264,39 +308,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:53
+#: en/live-config.7:61
#, no-wrap
msgid "B<live-config.noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:63
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:63
#, no-wrap
msgid "B<live-config.noxlogin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:65
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:66
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:68
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -306,7 +350,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:70
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
@@ -316,7 +360,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:72
msgid ""
"Although the configuration files placed in the conf.d directories do not "
"require a particular name or suffix, it's suggest for consistency to either "
@@ -326,136 +370,188 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:73
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:75
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:75
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:77
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:77
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:79
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:79
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:85
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:89
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:89
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:91
+msgid ""
+"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
+"parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:91
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:93
+msgid ""
+"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
+"parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:93
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:95
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"variant>=I<KEYBOARD_VARIANT>' parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:95
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:97
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"options>=I<KEYBOARD_OPTIONS>' parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
"parameter."
msgstr ""
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:100
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:102
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:87
+#: en/live-config.7:103
#, no-wrap
msgid "Adding new config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:105
msgid ""
"Downstream projects can put their scripts into /lib/live/config and don't "
"need to do anything else, the scripts will be called automatically during "
@@ -463,7 +559,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:107
msgid ""
"The scripts are best put into an own debian package. A sample package "
"containing an example script can be found in /usr/share/doc/live-config/"
@@ -471,13 +567,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:92
+#: en/live-config.7:108
#, no-wrap
msgid "Removing existing config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:94
+#: en/live-config.7:110
msgid ""
"It's not really possible to remove scripts itself in a sane way yet without "
"requiring to ship a locally modified B<live-config> package. However, the "
@@ -488,7 +584,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:96
+#: en/live-config.7:112
msgid ""
"The configuration files for the live system itself are best put into an own "
"debian package. A sample package containing an example configuration can be "
@@ -496,356 +592,367 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:97
+#: en/live-config.7:113
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:115
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:100
+#: en/live-config.7:116
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:102
+#: en/live-config.7:118
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:102
+#: en/live-config.7:118
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:104
+#: en/live-config.7:120
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:104
+#: en/live-config.7:120
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:106
+#: en/live-config.7:122
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:106
+#: en/live-config.7:122
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:108
+#: en/live-config.7:124
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:108
+#: en/live-config.7:124
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:110
+#: en/live-config.7:126
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:110
+#: en/live-config.7:126
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:128
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:112
+#: en/live-config.7:128
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:130
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:114
+#: en/live-config.7:130
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:116
+#: en/live-config.7:132
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:116
+#: en/live-config.7:132
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:118
+#: en/live-config.7:134
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:118
+#: en/live-config.7:134
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:136
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:120
+#: en/live-config.7:136
+#, no-wrap
+msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:138
+msgid "configures the keyboard."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:138
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:140
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:122
+#: en/live-config.7:140
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:142
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:124
+#: en/live-config.7:142
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:126
+#: en/live-config.7:144
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:126
+#: en/live-config.7:144
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:146
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:146
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:148
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:148
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:150
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:150
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:152
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:152
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:154
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:154
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:156
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:156
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:158
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:158
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:160
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:160
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:162
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:162
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:164
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:164
#, no-wrap
msgid "B<hook>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:166
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
msgstr ""
#. type: SH
-#: en/live-config.7:149
+#: en/live-config.7:167
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:168
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:151
+#: en/live-config.7:169
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:170
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:153
+#: en/live-config.7:171
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:172
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:155
+#: en/live-config.7:173
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:174
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:158
+#: en/live-config.7:176
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:178
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:180
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:163
+#: en/live-config.7:181
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:165
+#: en/live-config.7:183
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -853,13 +960,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:166
+#: en/live-config.7:184
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:186
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -868,13 +975,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:169
+#: en/live-config.7:187
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:188
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/scripts/config.sh b/scripts/config.sh
index 45d9efc..7ecd72c 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -81,6 +81,23 @@ Cmdline ()
LIVE_UTC="${_PARAMETER#live-config.utc=}"
;;
+ # 012-console-setup, 013-keyboard-configuration
+ live-config.keyboard-model=*)
+ LIVE_KEYBOARD_MODEL="${_PARAMETER#live-config.keyboard-model=}"
+ ;;
+
+ live-config.keyboard-layout=*)
+ LIVE_KEYBOARD_LAYOUT="${_PARAMETER#live-config.keyboard-layout=}"
+ ;;
+
+ live-config.keyboard-variant=*)
+ LIVE_KEYBOARD_VARIANT="${_PARAMETER#live-config.keyboard-variant=}"
+ ;;
+
+ live-config.keyboard-options=*)
+ LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
+ ;;
+
# 999-hook
live-config.hook=*)
LIVE_HOOK="${_PARAMETER#live-config.hook=}"
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index 6f8e703..895b470 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -54,12 +54,11 @@ Configure_locales ()
if echo "${_LOCALE}" | grep -sqE '^[[:lower:]]{2}$'
then
- # input is like "locale=it", so we will convert and setup also the keyboard if not already set
- if [ -z "${KBD}" ]
+ # input is like "locale=ch", so we will convert and setup also the keyboard if not already set
+ if [ -z "${_KEYBOARD}" ]
then
- # FIXME: look if this keyb is supported
- KBD="${_LOCALE}"
- export KBD
+ _KEYBOARD="${_LOCALE}"
+ export _KEYBOARD
fi
_LOCALE_UP=$(echo "${_LOCALE}" | tr '[a-z]' '[A-Z]')
diff --git a/scripts/config/009-lxdm b/scripts/config/011-console-common
similarity index 53%
copy from scripts/config/009-lxdm
copy to scripts/config/011-console-common
index 43926c6..d708db6 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/011-console-common
@@ -8,31 +8,29 @@
# under certain conditions; see COPYING for details.
-Lxdm ()
+Console_common ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/lxdm.list ] || \
- [ -e /var/lib/live/config/lxdm ]
+ if [ ! -e /var/lib/dpkg/info/console-common.list ] || \
+ [ -e /var/lib/live/config/console-common.list ]
then
return
fi
- echo -n " lxdm"
+ echo -n " console-common"
- Configure_lxdm
+ Configure_console_common
}
-Configure_lxdm ()
+Configure_console_common ()
{
- if [ -e /etc/lxdm/lxdm.conf ]
+ if [ -n "${_KEYBOARD}" ]
then
- sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
- -e "s|^#?session.*\$|session|" \
- /etc/lxdm/lxdm.conf
- fi
+ install-keymap ${_KEYBOARD}
- # Creating state file
- touch /var/lib/live/config/lxdm
+ # Creating state file
+ touch /var/lib/live/config/console-common
+ fi
}
-Lxdm
+Console_common
diff --git a/scripts/config/012-console-setup b/scripts/config/012-console-setup
new file mode 100755
index 0000000..4a94987
--- /dev/null
+++ b/scripts/config/012-console-setup
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+
+Console_setup ()
+{
+ # Checking if package is installed or already configured
+ if [ ! -e /var/lib/dpkg/info/console-setup.list ] || \
+ [ -e /var/lib/live/config/console-setup ]
+ then
+ return
+ fi
+
+ # Don't run on squeeze and newer
+ if [ -e /var/lib/dpkg/info/keyboard-configuration.list ]
+ then
+ return
+ fi
+
+ echo -n " console-setup"
+
+ Configure_console_setup
+}
+
+Configure_console_setup ()
+{
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
+ then
+ echo "console-setup console-setup/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ then
+ echo "console-setup console-setup/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ then
+ echo "console-setup console-setup/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
+ then
+ echo "console-setup console-setup/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/console-setup
+ fi
+
+ if [ -e /tmp/debconf.live ]
+ then
+ debconf-set-selections < /tmp/debconf.live
+ rm -f /tmp/debconf.live
+
+ # Creating state file
+ touch /var/lib/live/config/console-setup
+ fi
+}
+
+Console_setup
diff --git a/scripts/config/013-keyboard-configuration b/scripts/config/013-keyboard-configuration
new file mode 100755
index 0000000..0637529
--- /dev/null
+++ b/scripts/config/013-keyboard-configuration
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+
+Keyboard_configuration ()
+{
+ # Checking if package is installed or already configured
+ if [ ! -e /var/lib/dpkg/info/keyboard-configuration.list ] || \
+ [ -e /var/lib/live/config/keyboard-configuration ]
+ then
+ return
+ fi
+
+ echo -n " keyboard-configuration"
+
+ Configure_keyboard_configuration
+}
+
+Configure_keyboard_configuration ()
+{
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
+ fi
+
+ if [ -e /tmp/debconf.live ]
+ then
+ debconf-set-selections < /tmp/debconf.live
+ rm -f /tmp/debconf.live
+
+ # Creating state file
+ touch /var/lib/live/config/keyboard-configuration
+ fi
+}
+
+Keyboard_configuration
--
live-config
More information about the debian-live-changes
mailing list