[SCM] live-config branch, upstream, updated. upstream/2.0_a6-1-g1d93257
Daniel Baumann
daniel at debian.org
Tue Jun 8 18:27:03 UTC 2010
The following commit has been merged in the upstream branch:
commit 1d93257fe2c1950cdaf59a661377d64d77d2f9b5
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 8 20:24:56 2010 +0200
Adding upstream version 2.0~a7.
diff --git a/VERSION b/VERSION
index a1d37aa..288a58c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a6
+2.0~a7
diff --git a/docs/TODO b/docs/TODO
index a1d87d2..9657425 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -21,3 +21,4 @@ we continue to release pre-releases until:
* add upstart integration.
* enable display managers only if they are the selected one.
* when not using persistency, do not import options into the debconf db.
+ * cleanup the scripts order and splitting.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 7512bdd..29b30e1 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 2010\-06\-08 2.0~a6 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 08.06.2010 2.0~a7 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -86,6 +86,10 @@ 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.xorg\-driver\fP=\fIXORG_TREIBER\fP 4
+Ermöglicht den Xorg Treiber manuell statt automatisch zu bestimmen.
+.IP \fBlive\-config.xorg\-resolution\fP=\fIXORG_AUFLÖSUNG\fP 4
+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
@@ -153,18 +157,24 @@ 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
+.IP \fBLIVE_KEYBOARD_MODEL\fP=\fITASTATUR_MODELL\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP' Parameter.
-.IP \fBLIVE_KEYBOARD_LAYOUT\fP=\fIKEYBOARD_LAYOUT\fP 4
+.IP \fBLIVE_KEYBOARD_LAOUT\fP=\fITASTATUR_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
+.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fITASTATUR_VARIANTE\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP' Parameter.
-.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIKEYBOARD_OPTIONS\fP 4
+.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fITASTATUR_OPTIONEN\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
+.IP \fBLIVE_XORG_DRIVER\fP=\fIXORG_TREIBER\fP 4
+Diese Variable enspricht dem '\fBlive\-config.xorg\-driver\fP=\fIXORG_TREIBER\fP'
+Parameter.
+.IP \fBLIVE_XORG_RESOLUTION\fP=\fIXORG_AUFLÖSUNG\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.xorg\-resolution\fP=\fIXORG_AUFLÖSUNG\fP' Parameter.
.IP "\fBLIVE_HOOKS\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
Diese Variable enspricht dem '\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP|
\&... |\fIURLn\fP' Parameter.
@@ -218,7 +228,7 @@ 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
+.IP "\fBconsole\-common\fP, \fBconsole\-setup\fP (lenny), \fBkeyboard\-configuration\fP (squeeze und neuer)" 4
konfiguriert die Tastatur.
.IP \fBsysvinit\fP 4
konfiguriert sysvinit.
@@ -256,6 +266,10 @@ schaltet update\-notifier ab.
schaltet anacron aus.
.IP \fButil\-linux\fP 4
schaltet hwclock von util\-linux ab.
+.IP \fBlogin\fP 4
+schaltet lastlog ab.
+.IP \fBxserver\-xorg\fP 4
+konfiguriert xserver\-xorg.
.IP \fBhooks\fP 4
erlaubt beliebige Kommands von einem Skript auf dem Live Medium oder von
einem HTTP/FTP Server auszuführen.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 72b5674..b943c2e 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~a6 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-08 2.0~a7 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -52,6 +52,10 @@ Allows to change the keyboard layout. There is no default value set.
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.xorg\-driver\fR=\fIXORG_DRIVER\fR" 4
+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.
@@ -96,6 +100,10 @@ This variable equals the '\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT
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_XORG_DRIVER\fR=\fIXORG_DRIVER\fR" 4
+This variable equals the '\fBlive\-config.xorg\-driver\fR=\fIXORG_DRIVER\fR' parameter.
+.IP "\fBLIVE_XORG_RESOLUTION\fR=\fIXORG_RESOLUTION\fR" 4
+This variable equals the '\fBlive\-config.xorg\-resolution\fR=\fIXORG_RESOLUTION\fR' parameter.
.IP "\fBLIVE_HOOKS\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
This variable equals the '\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
@@ -135,7 +143,7 @@ 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
+.IP "\fBconsole\-common\fR, \fBconsole\-setup\fR (lenny), \fBkeyboard\-configuration\fR (squeeze and newer)" 4
configures the keyboard.
.IP "\fBsysvinit\fR" 4
configures sysvinit.
@@ -171,6 +179,10 @@ disables update\-notifier.
disables anacron.
.IP "\fButil-linux\fR" 4
disables util-linux' hwclock.
+.IP "\fBlogin\fR" 4
+disables lastlog.
+.IP "\fBxserver\-xorg\fR" 4
+configures xserver-xorg.
.IP "\fBhooks\fR" 4
allows to run arbitrary commands from a script placed on the live media or an http/ftp server.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index fcd5594..e9cb351 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~a6\n"
-"POT-Creation-Date: 2010-06-08 06:00+0300\n"
+"Project-Id-Version: live-config 2.0~a7\n"
+"POT-Creation-Date: 2010-06-08 20:21+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"
@@ -23,13 +23,15 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
+#, no-wrap
msgid "2010-06-08"
msgstr "08.06.2010"
#. type: TH
#: en/live-config.7:9
-msgid "2.0~a6"
-msgstr "2.0~a6"
+#, no-wrap
+msgid "2.0~a7"
+msgstr "2.0~a7"
#. type: TH
#: en/live-config.7:9
@@ -325,11 +327,33 @@ msgstr ""
#. type: IP
#: en/live-config.7:55
#, no-wrap
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
+msgstr "B<live-config.xorg-driver>=I<XORG_TREIBER>"
+
+#. type: Plain text
+#: en/live-config.7:57
+msgid "Allows to set xorg driver instead of autodetecting it."
+msgstr "Ermöglicht den Xorg Treiber manuell statt automatisch zu bestimmen."
+
+#. type: IP
+#: en/live-config.7:57
+#, no-wrap
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
+msgstr "B<live-config.xorg-resolution>=I<XORG_AUFLÖSUNG>"
+
+#. type: Plain text
+#: en/live-config.7:59
+msgid "Allows to set xorg resolution instead of autodetecting it."
+msgstr "Ermöglicht die Xorg Auflösung manuell statt automatisch zu bestimmen."
+
+#. type: IP
+#: en/live-config.7:59
+#, no-wrap
msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ...|I<URLn>"
#. type: Plain text
-#: en/live-config.7:57
+#: 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 "
@@ -343,13 +367,13 @@ msgstr ""
"dem System installiert sein."
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:62
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:64
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -361,13 +385,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:61
+#: en/live-config.7:65
#, no-wrap
msgid "B<live-config.noroot>"
msgstr "B<live-config.noroot>"
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:67
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -376,13 +400,13 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:63
+#: en/live-config.7:67
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr "B<live-config.nottyautologin>"
#. type: Plain text
-#: en/live-config.7:65
+#: en/live-config.7:69
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
@@ -391,13 +415,13 @@ msgstr ""
"automatisch graphischen Login nicht."
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.noxautologin>"
msgstr "B<live-config.noxautologin>"
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:71
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -406,13 +430,13 @@ msgstr ""
"den automatischen tty Login nicht."
#. type: SS
-#: en/live-config.7:68
+#: en/live-config.7:72
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:70
+#: en/live-config.7:74
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -428,7 +452,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:76
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/"
@@ -443,7 +467,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:74
+#: en/live-config.7:78
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 "
@@ -459,13 +483,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:79
#, 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:77
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -474,13 +498,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:81
#, 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:79
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -489,13 +513,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -503,13 +527,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -517,13 +541,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:87
#, 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:85
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -532,50 +556,50 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:91
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:87
+#: en/live-config.7:91
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:93
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:89
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:95
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:91
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
-msgstr ""
+msgstr "B<LIVE_KEYBOARD_MODEL>=I<TASTATUR_MODELL>"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:97
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
@@ -584,13 +608,13 @@ msgstr ""
"model>=I<TASTATUR_MODELL>' Parameter."
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
-msgstr ""
+msgstr "B<LIVE_KEYBOARD_LAOUT>=I<TASTATUR_LAYOUT>"
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
@@ -599,13 +623,13 @@ msgstr ""
"layout>=I<TASTATUR_LAYOUT>' Parameter."
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr ""
+msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TASTATUR_VARIANTE>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -614,13 +638,13 @@ msgstr ""
"variant>=I<TASTATUR_VARIANTE>' Parameter."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
-msgstr ""
+msgstr "B<LIVE_KEYBOARD_OPTIONS>=I<TASTATUR_OPTIONEN>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -629,13 +653,43 @@ msgstr ""
"options>=I<TASTATUR_OPTIONEN>' Parameter."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:103
+#, 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
+msgid ""
+"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
+"parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.xorg-driver>=I<XORG_TREIBER>' "
+"Parameter."
+
+#. type: IP
+#: en/live-config.7:105
+#, 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
+msgid ""
+"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
+"parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.xorg-"
+"resolution>=I<XORG_AUFLÖSUNG>' Parameter."
+
+#. type: IP
+#: en/live-config.7:107
#, 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:101
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
@@ -644,13 +698,13 @@ msgstr ""
"I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:102
+#: en/live-config.7:110
#, no-wrap
msgid "CUSTOMIZATION"
msgstr "ANPASSUNG"
#. type: Plain text
-#: en/live-config.7:104
+#: en/live-config.7:112
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
@@ -659,13 +713,13 @@ msgstr ""
"oder lokale Verwendung."
#. type: SS
-#: en/live-config.7:105
+#: en/live-config.7:113
#, no-wrap
msgid "Adding new config scripts"
msgstr "Hinzufügen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:115
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 "
@@ -676,7 +730,7 @@ msgstr ""
"Startens ausgeführt."
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:117
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/"
@@ -687,13 +741,13 @@ msgstr ""
"examples."
#. type: SS
-#: en/live-config.7:110
+#: en/live-config.7:118
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Entfernen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:120
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 "
@@ -711,7 +765,7 @@ msgstr ""
"werden, siehe oben."
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:122
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 "
@@ -722,213 +776,213 @@ msgstr ""
"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
#. type: SH
-#: en/live-config.7:115
+#: en/live-config.7:123
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:125
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:118
+#: en/live-config.7:126
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:128
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:120
+#: en/live-config.7:128
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:130
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:122
+#: en/live-config.7:130
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:132
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:124
+#: en/live-config.7:132
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:126
+#: en/live-config.7:134
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:126
+#: en/live-config.7:134
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:136
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:136
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:138
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:138
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:140
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:140
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:142
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:142
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:144
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:144
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:146
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:146
#, no-wrap
-msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
-msgstr ""
+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:140
+#: en/live-config.7:148
msgid "configures the keyboard."
msgstr "konfiguriert die Tastatur."
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:148
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:150
msgid "configures sysvinit."
msgstr "konfiguriert sysvinit."
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:150 en/live-config.7:182
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:152 en/live-config.7:184
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:152
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:154
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:154
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:156
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:156
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:158
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:160
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:152
+#: en/live-config.7:160
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:162
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -936,123 +990,134 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:162
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:164
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:164
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:166
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:158
+#: en/live-config.7:166
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:168
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:168
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:170
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:162
+#: en/live-config.7:170
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:172
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:172
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:174
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:174
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:176
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:176
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:178
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:178
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:180
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:180
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:182
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:184
+#, no-wrap
+msgid "B<xserver-xorg>"
+msgstr "B<xserver-xorg>"
+
+#. type: Plain text
+#: en/live-config.7:186
+msgid "configures xserver-xorg."
+msgstr "konfiguriert xserver-xorg."
+
+#. type: IP
+#: en/live-config.7:186
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:188
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1061,77 +1126,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:177
+#: en/live-config.7:189
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:190
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:179
+#: en/live-config.7:191
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:192
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:181
+#: en/live-config.7:193
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:194
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:183
+#: en/live-config.7:195
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:196
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:186
+#: en/live-config.7:198
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:200
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:202
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:203
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:193
+#: en/live-config.7:205
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 "
@@ -1142,13 +1207,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:194
+#: en/live-config.7:206
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:208
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 "
@@ -1162,13 +1227,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:197
+#: en/live-config.7:209
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:210
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 e9acf88..c2c2e56 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 06:00+0300\n"
+"POT-Creation-Date: 2010-06-08 20:21+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"
@@ -30,7 +30,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a6"
+msgid "2.0~a7"
msgstr ""
#. type: TH
@@ -281,11 +281,33 @@ msgstr ""
#. type: IP
#: en/live-config.7:55
#, no-wrap
-msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
msgstr ""
#. type: Plain text
#: en/live-config.7:57
+msgid "Allows to set xorg driver instead of autodetecting it."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:57
+#, no-wrap
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:59
+msgid "Allows to set xorg resolution instead of autodetecting it."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:59
+#, no-wrap
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
@@ -294,13 +316,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:62
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:64
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -308,52 +330,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:61
+#: en/live-config.7:65
#, no-wrap
msgid "B<live-config.noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:67
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:63
+#: en/live-config.7:67
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:65
+#: en/live-config.7:69
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
msgstr ""
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.noxautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:71
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:68
+#: en/live-config.7:72
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:70
+#: en/live-config.7:74
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 +385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:76
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/"
@@ -373,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:74
+#: en/live-config.7:78
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 "
@@ -383,188 +405,214 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:79
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:91
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:91
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:93
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:95
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:97
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:103
+#, no-wrap
+msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:105
+msgid ""
+"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
+"parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:105
+#, no-wrap
+msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:107
+msgid ""
+"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
+"parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
msgstr ""
#. type: SH
-#: en/live-config.7:102
+#: en/live-config.7:110
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:104
+#: en/live-config.7:112
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:105
+#: en/live-config.7:113
#, no-wrap
msgid "Adding new config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:115
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 "
@@ -572,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:117
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/"
@@ -580,13 +628,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:110
+#: en/live-config.7:118
#, no-wrap
msgid "Removing existing config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:120
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 "
@@ -597,7 +645,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:122
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 "
@@ -605,411 +653,422 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:115
+#: en/live-config.7:123
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:125
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:118
+#: en/live-config.7:126
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:128
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:120
+#: en/live-config.7:128
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:130
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:122
+#: en/live-config.7:130
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:132
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:124
+#: en/live-config.7:132
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:126
+#: en/live-config.7:134
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:126
+#: en/live-config.7:134
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:128
+#: en/live-config.7:136
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:136
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:138
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:138
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:140
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:140
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:142
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:142
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:144
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:144
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:146
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:146
#, no-wrap
-msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:148
msgid "configures the keyboard."
msgstr ""
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:148
#, no-wrap
msgid "B<sysvinit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:150
msgid "configures sysvinit."
msgstr ""
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:150 en/live-config.7:182
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:152 en/live-config.7:184
msgid "disables lastlog."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:152
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:154
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:154
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:156
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:156
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:158
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:160
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:160
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:162
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:162
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:164
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:164
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:166
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:166
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:168
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:168
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:170
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:170
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:172
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:172
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:174
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:174
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:176
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:176
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:178
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:178
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:180
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:180
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:182
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:184
+#, no-wrap
+msgid "B<xserver-xorg>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:186
+msgid "configures xserver-xorg."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:186
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:188
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:177
+#: en/live-config.7:189
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:190
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:179
+#: en/live-config.7:191
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:192
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:181
+#: en/live-config.7:193
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:194
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:183
+#: en/live-config.7:195
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:196
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:186
+#: en/live-config.7:198
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:200
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:202
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:203
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:193
+#: en/live-config.7:205
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 "
@@ -1017,13 +1076,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:194
+#: en/live-config.7:206
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:208
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 "
@@ -1032,13 +1091,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:197
+#: en/live-config.7:209
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:210
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 074bc77..f98071c 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -98,6 +98,15 @@ Cmdline ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
;;
+ # 116-xserver-xorg
+ live-config.xorg-driver=*)
+ LIVE_XORG_DRIVER="${_PARAMETER#live-config.xorg-driver=}"
+ ;;
+
+ live-config.xorg-resolution=*)
+ LIVE_XORG_RESOLUTION="${_PARAMETER#live-config.xorg-resolution=}"
+ ;;
+
# 999-hooks
live-config.hooks=*)
LIVE_HOOKS="${_PARAMETER#live-config.hooks=}"
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
new file mode 100755
index 0000000..15a2229
--- /dev/null
+++ b/scripts/config/116-xserver-xorg
@@ -0,0 +1,78 @@
+#!/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.
+
+
+Xserver_xorg ()
+{
+ # Checking if package is installed
+ if [ ! -e /var/lib/dpkg/info/xserver-xorg.list ] || \
+ [ -e /var/lib/live/config/xserver-xorg ]
+ then
+ return
+ fi
+
+ echo -n " xserver-xorg"
+
+ Configure_xserver_xorg
+}
+
+Configure_xserver_xorg ()
+{
+ if [ -n "${LIVE_XORG_DRIVER}" ]
+ then
+ echo "xserver-xorg xserver-xorg/autodetect_video_card" >> /tmp/debconf.live
+ echo "xserver-xorg xserver-xorg/config/device/driver ${LIVE_XORG_DRIVER}" >> /tmp/debconf.live
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
+ then
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/model select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ then
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ then
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+xserver-xorg/config/inputdevice/keyboard/variant
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
+ then
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/options string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+ fi
+
+ if [ -n "${LIVE_XORG_RESOLUTION}" ]
+ then
+ echo "xrandr -s ${LIVE_XORG_RESOLUTION} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
+ else
+ rm -f /etc/X11/Xsession.d/21xvidemode
+ fi
+
+ if [ -e /tmp/debconf.live ]
+ then
+ debconf-set-selections < /tmp/debconf.live
+ rm -f /tmp/debconf.live
+
+ dexconf
+
+# dpkg-reconfigure -f non-interactive -p critical \
+# xserver-xorg 2>&1 \
+# | grep -v "overwriting possibly-customised configuration" \
+# | grep -v "file; backup in /etc/X11/xorg.conf"
+
+ # Creating state file
+ touch /var/lib/live/config/xserver-xorg
+ fi
+}
+
+Xserver_xorg
--
live-config
More information about the debian-live-changes
mailing list