[SCM] live-config branch, upstream, updated. upstream/2.0_a7-1-g3e0be16
Daniel Baumann
daniel at debian.org
Thu Jun 10 10:42:58 UTC 2010
The following commit has been merged in the upstream branch:
commit 3e0be164759afc91702f0e50a3e28e51dd1fcd64
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jun 10 12:41:58 2010 +0200
Adding upstream version 2.0~a8.
diff --git a/VERSION b/VERSION
index 288a58c..9eaada7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a7
+2.0~a8
diff --git a/docs/TODO b/docs/TODO
index 9657425..10c4598 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -11,8 +11,19 @@ we continue to release pre-releases until:
* boot parameters don't change anymore and we agreed on a common layout of
everything.
+2. Regressions
-2. Todo items
+Everything that worked with live-initramfs works with live-boot/live-config,
+except for the following things:
+
+ * temporarily no serial console support during booting. this will be added
+ back in some time.
+ * the locale script temporarily doesn't automatically configures the keyboard
+ when a 'short' locale is specified (like locales=de).
+ * not exactely a regression, but some boot parameters did change, have a look
+ at the manpage of live-config.
+
+3. Todo items
* allow some scripts (most prominently locales) to be run even in persistent mode.
* use build-time distribution detection, remove dead code from build.
diff --git a/examples/live-config-foobar/configs/foobar b/examples/live-config-foobar/configs/foobar
deleted file mode 100644
index 87eaaf6..0000000
--- a/examples/live-config-foobar/configs/foobar
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/live/config.conf.d/foobar
-
-LIVE_FOOBAR="foobar"
diff --git a/examples/live-config-foobar/configs/foobar.conf b/examples/live-config-foobar/configs/foobar.conf
new file mode 100644
index 0000000..c3c1213
--- /dev/null
+++ b/examples/live-config-foobar/configs/foobar.conf
@@ -0,0 +1,3 @@
+# /etc/live/config.conf.d/foobar.conf
+
+LIVE_FOOBAR="foobar"
diff --git a/examples/live-config-foobar/scripts/nnn-foobar b/examples/live-config-foobar/scripts/900-foobar
similarity index 94%
rename from examples/live-config-foobar/scripts/nnn-foobar
rename to examples/live-config-foobar/scripts/900-foobar
index 5a9def5..3097f2f 100755
--- a/examples/live-config-foobar/scripts/nnn-foobar
+++ b/examples/live-config-foobar/scripts/900-foobar
@@ -24,9 +24,6 @@ Foobar ()
Configure_foobar ()
{
- # Checking if package is already configured
- sleep 1
-
# Boot parameters can be acted up either this way...
if ! grep -qs "live-helper.foobar" /proc/cmdline
then
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 29b30e1..ed138df 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 08.06.2010 2.0~a7 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 10.06.2010 2.0~a8 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -77,9 +77,10 @@ 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\-layout\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
+Ermöglicht das Tastatur Layout zu bestimmen. Wenn mehr als ein Layout
+angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
+X11. 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.
@@ -92,10 +93,17 @@ Ermöglicht den Xorg Treiber manuell statt automatisch zu bestimmen.
Ermöglicht die Xorg Auflösung manuell statt automatisch zu bestimmen.
.IP "\fBlive\-config.hooks\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
-Abhängigkeiten, die für das Ausführen der Dateien notwendig sind, bereits
-installiert sein, zum Beispiel muss für ein Python Skript bereits Python auf
-dem System installiert sein.
+auszuführen. Die URLs müssen durch wget (http, ftp oder file://) aufösbar
+sein, die Dateien werden in /tmp des laufenden Live Systems ausgeführt und
+es müssen alle Abhängigkeiten, die für das Ausführen der Dateien notwendig
+sind,bereits installiert sein, zum Beispiel muss für ein Python Skript
+bereits Python auf dem System installiert sein. Einige Hooks für häufige
+Anwendungsfälle sind unter <\fIhttp://live.debian.net/other/hooks\fP>
+verfügbar.
+.br
+Falls die Datei sich auf dem Live Medium befindet, kann sie mittels
+file:///live/image/\fIFILE\fP benutzt werden, falls sie sich im Root
+Dateisystem des Live Systems selbst befindet, mittels file:///\fIFILE\fP.
.SS "Boot Parameter (Abkürzungen)"
\fBlive\-config\fP stellt Abkürzungen für einige häufige verwendete
@@ -109,7 +117,7 @@ Privilegien auf dem System mehr erlangen.
.IP \fBlive\-config.nottyautologin\fP 4
Schaltet den automatischen Login via TTY ab, dies beeinflusst den
automatisch graphischen Login nicht.
-.IP \fBlive\-config.noxautologin\fP 4
+.IP \fBlive\-config.nox11autologin\fP 4
Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
den automatischen tty Login nicht.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index b943c2e..09c2639 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\-08 2.0~a7 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-10 2.0~a8 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -46,8 +46,8 @@ Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is '
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\-layout\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
+Allows to change the keyboard layout. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. 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
@@ -57,7 +57,9 @@ Allows to set xorg driver instead of autodetecting it.
.IP "\fBlive\-config.xorg\-resolution\fR=\fIXORG_RESOLUTION\fR" 4
Allows to set xorg resolution instead of autodetecting it.
.IP "\fBlive\-config.hooks\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.
+Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget (http, ftp or file://), the files are executed in /tmp of the running live system, 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. Some hooks for some common use-cases are available at <\fIhttp://live.debian.net/other/hooks\fR>.
+.br
+If the file is placed on the live media, it can be fetched with file:///live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.SS Boot Parameters (shortcuts)
For some common use cases where it would require to combine several individual parameters, \fBlive\-config\fR provides shortcuts. This allows both to have full granularity over all the options, as well keep things simple.
@@ -66,7 +68,7 @@ For some common use cases where it would require to combine several individual p
Disables the sudo and policykit, the user cannot gain root privileges on the system.
.IP "\fBlive\-config.nottyautologin\fR" 4
Disables the automatic login on the terminal, not affecting the graphical autologin.
-.IP "\fBlive\-config.noxautologin\fR" 4
+.IP "\fBlive\-config.nox11autologin\fR" 4
Disables the automatic login with any display manager, not affecting tty autologin.
.SS Configuration Files
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index e9cb351..f602012 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0~a7\n"
-"POT-Creation-Date: 2010-06-08 20:21+0300\n"
+"Project-Id-Version: live-config 2.0~a8\n"
+"POT-Creation-Date: 2010-06-10 12:39+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 "2010-06-08"
-msgstr "08.06.2010"
+msgid "2010-06-10"
+msgstr "10.06.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a7"
-msgstr "2.0~a7"
+msgid "2.0~a8"
+msgstr "2.0~a8"
#. type: TH
#: en/live-config.7:9
@@ -288,15 +288,19 @@ msgstr ""
#. 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>"
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgstr "B<live-config.keyboard-layout>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
#. type: Plain text
#: en/live-config.7:51
-msgid "Allows to change the keyboard layout. There is no default value set."
+msgid ""
+"Allows to change the keyboard layout. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert "
-"gesetzt."
+"Ermöglicht das Tastatur Layout zu bestimmen. Wenn mehr als ein Layout "
+"angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter "
+"X11. Es ist kein Standardwert gesetzt."
#. type: IP
#: en/live-config.7:51
@@ -356,24 +360,40 @@ msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ...|I<URLn>"
#: en/live-config.7:61
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 "
-"any, already installed, e.g. if a python script should be executed the "
-"system needs python installed."
+"must be fetchable by wget (http, ftp or file://), the files are executed in /"
+"tmp of the running live system, 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. Some hooks for some common use-cases are "
+"available at E<lt>I<http://live.debian.net/other/hooks>E<gt>."
msgstr ""
"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 "
-"Abhängigkeiten, die für das Ausführen der Dateien notwendig sind, bereits "
-"installiert sein, zum Beispiel muss für ein Python Skript bereits Python auf "
-"dem System installiert sein."
+"auszuführen. Die URLs müssen durch wget (http, ftp oder file://) aufösbar "
+"sein, die Dateien werden in /tmp des laufenden Live Systems ausgeführt und "
+"es müssen alle Abhängigkeiten, die für das Ausführen der Dateien notwendig "
+"sind,bereits installiert sein, zum Beispiel muss für ein Python Skript "
+"bereits Python auf dem System installiert sein. Einige Hooks für häufige "
+"Anwendungsfälle sind unter E<lt>I<http://live.debian.net/other/hooks>E<gt> "
+"verfügbar."
+
+#. type: Plain text
+#: en/live-config.7:63
+msgid ""
+"If the file is placed on the live media, it can be fetched with file:///live/"
+"image/I<FILE>, or with file:///I<FILE> if it is in the root filesystem of "
+"the live system itself."
+msgstr ""
+"Falls die Datei sich auf dem Live Medium befindet, kann sie mittels file:///"
+"live/image/I<FILE> benutzt werden, falls sie sich im Root Dateisystem des "
+"Live Systems selbst befindet, mittels file:///I<FILE>."
#. type: SS
-#: en/live-config.7:62
+#: en/live-config.7:64
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:66
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -385,13 +405,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:67
#, no-wrap
msgid "B<live-config.noroot>"
msgstr "B<live-config.noroot>"
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:69
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -400,13 +420,13 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr "B<live-config.nottyautologin>"
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
@@ -415,13 +435,13 @@ msgstr ""
"automatisch graphischen Login nicht."
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
-msgid "B<live-config.noxautologin>"
-msgstr "B<live-config.noxautologin>"
+msgid "B<live-config.nox11autologin>"
+msgstr "B<live-config.nox11autologin>"
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -430,13 +450,13 @@ msgstr ""
"den automatischen tty Login nicht."
#. type: SS
-#: en/live-config.7:72
+#: en/live-config.7:74
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:74
+#: en/live-config.7:76
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -452,7 +472,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:76
+#: en/live-config.7:78
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/"
@@ -467,7 +487,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
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 "
@@ -483,13 +503,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, 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:81
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -498,13 +518,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:83
#, 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:83
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -513,13 +533,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -527,13 +547,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -541,13 +561,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:89
#, 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:89
+#: en/live-config.7:91
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -556,50 +576,50 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
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:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
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:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
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:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr "B<LIVE_KEYBOARD_MODEL>=I<TASTATUR_MODELL>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
@@ -608,13 +628,13 @@ msgstr ""
"model>=I<TASTATUR_MODELL>' Parameter."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
msgstr "B<LIVE_KEYBOARD_LAOUT>=I<TASTATUR_LAYOUT>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
@@ -623,13 +643,13 @@ msgstr ""
"layout>=I<TASTATUR_LAYOUT>' Parameter."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TASTATUR_VARIANTE>"
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -638,13 +658,13 @@ msgstr ""
"variant>=I<TASTATUR_VARIANTE>' Parameter."
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr "B<LIVE_KEYBOARD_OPTIONS>=I<TASTATUR_OPTIONEN>"
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -653,13 +673,13 @@ msgstr ""
"options>=I<TASTATUR_OPTIONEN>' Parameter."
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr "B<LIVE_XORG_DRIVER>=I<XORG_TREIBER>"
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
@@ -668,13 +688,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr "B<LIVE_XORG_RESOLUTION>=I<XORG_AUFLÖSUNG>"
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
@@ -683,13 +703,13 @@ msgstr ""
"resolution>=I<XORG_AUFLÖSUNG>' Parameter."
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
@@ -698,13 +718,13 @@ msgstr ""
"I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:110
+#: en/live-config.7:112
#, no-wrap
msgid "CUSTOMIZATION"
msgstr "ANPASSUNG"
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:114
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
@@ -713,13 +733,13 @@ msgstr ""
"oder lokale Verwendung."
#. type: SS
-#: en/live-config.7:113
+#: en/live-config.7:115
#, no-wrap
msgid "Adding new config scripts"
msgstr "Hinzufügen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
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 "
@@ -730,7 +750,7 @@ msgstr ""
"Startens ausgeführt."
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
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/"
@@ -741,13 +761,13 @@ msgstr ""
"examples."
#. type: SS
-#: en/live-config.7:118
+#: en/live-config.7:120
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Entfernen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:122
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 "
@@ -765,7 +785,7 @@ msgstr ""
"werden, siehe oben."
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:124
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 "
@@ -776,213 +796,213 @@ msgstr ""
"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
#. type: SH
-#: en/live-config.7:123
+#: en/live-config.7:125
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:127
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:126
+#: en/live-config.7:128
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:130
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:130
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:132
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:132
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:134
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:134
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:136
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:136
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:138
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:138
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:140
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:140
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:142
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:144
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:144
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:146
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze und neuer)"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
msgid "configures the keyboard."
msgstr "konfiguriert die Tastatur."
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:152
msgid "configures sysvinit."
msgstr "konfiguriert sysvinit."
#. type: IP
-#: en/live-config.7:150 en/live-config.7:182
+#: en/live-config.7:152 en/live-config.7:184
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:154 en/live-config.7:186
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
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:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -990,134 +1010,134 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
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:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
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:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "configures xserver-xorg."
msgstr "konfiguriert xserver-xorg."
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1126,77 +1146,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:189
+#: en/live-config.7:191
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:191
+#: en/live-config.7:193
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:193
+#: en/live-config.7:195
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:197
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:203
+#: en/live-config.7:205
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:205
+#: en/live-config.7:207
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 "
@@ -1207,13 +1227,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:206
+#: en/live-config.7:208
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
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 "
@@ -1227,13 +1247,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:209
+#: en/live-config.7:211
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
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 c2c2e56..752f3e5 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-08 20:21+0300\n"
+"POT-Creation-Date: 2010-06-10 12:39+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,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-08"
+msgid "2010-06-10"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a7"
+msgid "2.0~a8"
msgstr ""
#. type: TH
@@ -248,12 +248,15 @@ msgstr ""
#. type: IP
#: en/live-config.7:49
#, no-wrap
-msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
msgstr ""
#. type: Plain text
#: en/live-config.7:51
-msgid "Allows to change the keyboard layout. There is no default value set."
+msgid ""
+"Allows to change the keyboard layout. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
#. type: IP
@@ -310,19 +313,29 @@ msgstr ""
#: en/live-config.7:61
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 "
-"any, already installed, e.g. if a python script should be executed the "
-"system needs python installed."
+"must be fetchable by wget (http, ftp or file://), the files are executed in /"
+"tmp of the running live system, 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. Some hooks for some common use-cases are "
+"available at E<lt>I<http://live.debian.net/other/hooks>E<gt>."
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:63
+msgid ""
+"If the file is placed on the live media, it can be fetched with file:///live/"
+"image/I<FILE>, or with file:///I<FILE> if it is in the root filesystem of "
+"the live system itself."
msgstr ""
#. type: SS
-#: en/live-config.7:62
+#: en/live-config.7:64
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:66
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -330,52 +343,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:67
#, no-wrap
msgid "B<live-config.noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:69
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
msgstr ""
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
-msgid "B<live-config.noxautologin>"
+msgid "B<live-config.nox11autologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:72
+#: en/live-config.7:74
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:74
+#: en/live-config.7:76
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -385,7 +398,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:76
+#: en/live-config.7:78
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/"
@@ -395,7 +408,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
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 "
@@ -405,214 +418,214 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
msgstr ""
#. type: SH
-#: en/live-config.7:110
+#: en/live-config.7:112
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:114
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:113
+#: en/live-config.7:115
#, no-wrap
msgid "Adding new config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
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 "
@@ -620,7 +633,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
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/"
@@ -628,13 +641,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:118
+#: en/live-config.7:120
#, no-wrap
msgid "Removing existing config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:122
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 "
@@ -645,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:124
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 "
@@ -653,422 +666,422 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:123
+#: en/live-config.7:125
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:127
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:126
+#: en/live-config.7:128
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:130
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:130
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:132
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:132
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:134
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:134
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:136
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:136
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:138
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:138
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:140
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:140
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:142
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:144
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:144
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:146
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
msgid "configures the keyboard."
msgstr ""
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
#, no-wrap
msgid "B<sysvinit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:152
msgid "configures sysvinit."
msgstr ""
#. type: IP
-#: en/live-config.7:150 en/live-config.7:182
+#: en/live-config.7:152 en/live-config.7:184
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:154 en/live-config.7:186
msgid "disables lastlog."
msgstr ""
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
#, no-wrap
msgid "B<xserver-xorg>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "configures xserver-xorg."
msgstr ""
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
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:189
+#: en/live-config.7:191
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:191
+#: en/live-config.7:193
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:193
+#: en/live-config.7:195
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:197
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:203
+#: en/live-config.7:205
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:205
+#: en/live-config.7:207
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 "
@@ -1076,13 +1089,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:206
+#: en/live-config.7:208
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
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 "
@@ -1091,13 +1104,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:209
+#: en/live-config.7:211
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
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 f98071c..f4da885 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -124,7 +124,7 @@ Cmdline ()
LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
;;
- live-config.noxautologin)
+ live-config.nox11autologin)
# Disables graphical autologin, no matter what
# mechanism
_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
diff --git a/scripts/config/106-kde-services b/scripts/config/106-kde-services
index 5c884bf..ccfdcc3 100755
--- a/scripts/config/106-kde-services
+++ b/scripts/config/106-kde-services
@@ -37,6 +37,9 @@ Configure_kde_services ()
rm -f /usr/share/kde4/services/plasma-runner-contacts.desktop # starts akonadi
rm -f /usr/share/kde4/services/kded/notificationhelper.desktop
+ # should enable kxkb in ~/.kde/share/config/kxkbrc
+ # if multiple layouts are specified. gnome does it per default.
+
# Creating state file
touch /var/lib/live/config/kde-services
}
--
live-config
More information about the debian-live-changes
mailing list