[SCM] live-config branch, upstream, updated. upstream/2.0_a8-1-gb67179d
Daniel Baumann
daniel at debian.org
Fri Jun 11 16:40:54 UTC 2010
The following commit has been merged in the upstream branch:
commit b67179dde7cc430789d300bb6f008ec9e2e70bf1
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jun 11 18:37:36 2010 +0200
Adding upstream version 2.0~a9.
diff --git a/VERSION b/VERSION
index 9eaada7..191f5f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a8
+2.0~a9
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index ed138df..5286174 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 10.06.2010 2.0~a8 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 11.06.2010 2.0~a9 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -87,6 +87,8 @@ 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.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
+Ermöglicht Services durch update\-rc.d abzuschalten.
.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
@@ -177,6 +179,9 @@ Diese Variable enspricht dem
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fITASTATUR_OPTIONEN\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
+.IP "\fBLIVE_SYSV_RC\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
+Diese Variable enspricht dem '\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP
+\&... \fISERVICEn\fP' Parameter.
.IP \fBLIVE_XORG_DRIVER\fP=\fIXORG_TREIBER\fP 4
Diese Variable enspricht dem '\fBlive\-config.xorg\-driver\fP=\fIXORG_TREIBER\fP'
Parameter.
@@ -236,10 +241,14 @@ konfiguriert Autologin in kdm.
konfiguriert Autologin in lxdm.
.IP \fBnodm\fP 4
konfiguriert Autologin in nodm.
+.IP \fBslim\fP 4
+konfiguriert Autologin in slim.
.IP "\fBconsole\-common\fP, \fBconsole\-setup\fP (lenny), \fBkeyboard\-configuration\fP (squeeze und neuer)" 4
konfiguriert die Tastatur.
.IP \fBsysvinit\fP 4
konfiguriert sysvinit.
+.IP \fBsysv\-rc\fP 4
+konfiguriert sysv\-rc durch abschalten von angegebenen Services.
.IP \fBlogin\fP 4
schaltet lastlog ab.
.IP \fBapport\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 09c2639..de76108 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\-10 2.0~a8 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-11 2.0~a9 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -52,6 +52,8 @@ Allows to change the keyboard layout. If more than one is specified, the tools o
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.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
+Allows to disable sysv services through update-rc.d.
.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
@@ -102,6 +104,8 @@ 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_SYSV_RC\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
+This variable equals the '\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\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
@@ -145,10 +149,14 @@ configures autologin in kdm.
configures autologin in lxdm.
.IP "\fBnodm\fR" 4
configures autologin in nodm.
+.IP "\fBslim\fR" 4
+configures autologin in slim.
.IP "\fBconsole\-common\fR, \fBconsole\-setup\fR (lenny), \fBkeyboard\-configuration\fR (squeeze and newer)" 4
configures the keyboard.
.IP "\fBsysvinit\fR" 4
configures sysvinit.
+.IP "\fBsysv-rc\fR" 4
+configures sysv-rc by disabling listed services.
.IP "\fBlogin\fR" 4
disables lastlog.
.IP "\fBapport\fR" 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index f602012..02260e6 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~a8\n"
-"POT-Creation-Date: 2010-06-10 12:39+0300\n"
+"Project-Id-Version: live-config 2.0~a9\n"
+"POT-Creation-Date: 2010-06-11 18:35+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-10"
-msgstr "10.06.2010"
+msgid "2010-06-11"
+msgstr "11.06.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a8"
-msgstr "2.0~a8"
+msgid "2.0~a9"
+msgstr "2.0~a9"
#. type: TH
#: en/live-config.7:9
@@ -331,33 +331,44 @@ msgstr ""
#. type: IP
#: en/live-config.7:55
#, no-wrap
+msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgstr "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+
+#. type: Plain text
+#: en/live-config.7:57
+msgid "Allows to disable sysv services through update-rc.d."
+msgstr "Ermöglicht Services durch update-rc.d abzuschalten."
+
+#. type: IP
+#: en/live-config.7:57
+#, 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
+#: en/live-config.7:59
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
+#: en/live-config.7:59
#, 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
+#: en/live-config.7:61
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
+#: en/live-config.7:61
#, 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:61
+#: en/live-config.7:63
msgid ""
"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 /"
@@ -376,7 +387,7 @@ msgstr ""
"verfügbar."
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:65
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 "
@@ -387,13 +398,13 @@ msgstr ""
"Live Systems selbst befindet, mittels file:///I<FILE>."
#. type: SS
-#: en/live-config.7:64
+#: en/live-config.7:66
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:66
+#: en/live-config.7:68
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -405,13 +416,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.noroot>"
msgstr "B<live-config.noroot>"
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -420,13 +431,13 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr "B<live-config.nottyautologin>"
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
@@ -435,13 +446,13 @@ msgstr ""
"automatisch graphischen Login nicht."
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:73
#, no-wrap
msgid "B<live-config.nox11autologin>"
msgstr "B<live-config.nox11autologin>"
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:75
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -450,13 +461,13 @@ msgstr ""
"den automatischen tty Login nicht."
#. type: SS
-#: en/live-config.7:74
+#: en/live-config.7:76
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:76
+#: en/live-config.7:78
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -472,7 +483,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
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/"
@@ -487,7 +498,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:80
+#: en/live-config.7:82
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 "
@@ -503,13 +514,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:83
#, 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:83
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -518,13 +529,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:85
#, 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:85
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -533,13 +544,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -547,13 +558,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -561,13 +572,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, 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:91
+#: en/live-config.7:93
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -576,50 +587,50 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
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:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
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:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
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:97
+#: en/live-config.7:99
#, 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:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
@@ -628,13 +639,13 @@ msgstr ""
"model>=I<TASTATUR_MODELL>' Parameter."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, 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:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
@@ -643,13 +654,13 @@ msgstr ""
"layout>=I<TASTATUR_LAYOUT>' Parameter."
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, 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:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -658,13 +669,13 @@ msgstr ""
"variant>=I<TASTATUR_VARIANTE>' Parameter."
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, 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:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -673,13 +684,28 @@ msgstr ""
"options>=I<TASTATUR_OPTIONEN>' Parameter."
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
+#, no-wrap
+msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgstr "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+
+#. type: Plain text
+#: en/live-config.7:109
+msgid ""
+"This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
+"I<SERVICEn>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.sysv-rc>=I<SERVICE1>,"
+"I<SERVICE2> ... I<SERVICEn>' Parameter."
+
+#. type: IP
+#: en/live-config.7:109
#, 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:107
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
@@ -688,13 +714,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:111
#, 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:109
+#: en/live-config.7:113
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
@@ -703,13 +729,13 @@ msgstr ""
"resolution>=I<XORG_AUFLÖSUNG>' Parameter."
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:113
#, 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:111
+#: en/live-config.7:115
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
@@ -718,13 +744,13 @@ msgstr ""
"I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:112
+#: en/live-config.7:116
#, no-wrap
msgid "CUSTOMIZATION"
msgstr "ANPASSUNG"
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:118
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
@@ -733,13 +759,13 @@ msgstr ""
"oder lokale Verwendung."
#. type: SS
-#: en/live-config.7:115
+#: en/live-config.7:119
#, no-wrap
msgid "Adding new config scripts"
msgstr "Hinzufügen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:121
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 "
@@ -750,7 +776,7 @@ msgstr ""
"Startens ausgeführt."
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:123
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/"
@@ -761,13 +787,13 @@ msgstr ""
"examples."
#. type: SS
-#: en/live-config.7:120
+#: en/live-config.7:124
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Entfernen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:126
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 "
@@ -785,7 +811,7 @@ msgstr ""
"werden, siehe oben."
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:128
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 "
@@ -796,213 +822,235 @@ msgstr ""
"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
#. type: SH
-#: en/live-config.7:125
+#: en/live-config.7:129
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:131
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:128
+#: en/live-config.7:132
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:134
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:134
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:136
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:136
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:138
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:138
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:140
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:140
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:142
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:142
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:144
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:144
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:146
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:146
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:148
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:148
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:150
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:150
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:152
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:152
+#, no-wrap
+msgid "B<slim>"
+msgstr "B<slim>"
+
+#. type: Plain text
+#: en/live-config.7:154
+msgid "configures autologin in slim."
+msgstr "konfiguriert Autologin in slim."
+
+#. type: IP
+#: en/live-config.7:154
#, 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:150
+#: en/live-config.7:156
msgid "configures the keyboard."
msgstr "konfiguriert die Tastatur."
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:156
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:158
msgid "configures sysvinit."
msgstr "konfiguriert sysvinit."
#. type: IP
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:158
+#, no-wrap
+msgid "B<sysv-rc>"
+msgstr "B<sysv-rc>"
+
+#. type: Plain text
+#: en/live-config.7:160
+msgid "configures sysv-rc by disabling listed services."
+msgstr "konfiguriert sysv-rc durch abschalten von angegebenen Services."
+
+#. type: IP
+#: en/live-config.7:160 en/live-config.7:192
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:154 en/live-config.7:186
+#: en/live-config.7:162 en/live-config.7:194
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:162
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:164
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:164
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:166
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:166
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:168
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:168
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:170
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:162
+#: en/live-config.7:170
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:172
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -1010,134 +1058,134 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:172
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:174
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:174
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:176
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:168
+#: en/live-config.7:176
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:178
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:178
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:180
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:172
+#: en/live-config.7:180
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:182
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:182
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:184
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:184
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:186
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:186
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:188
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:188
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:190
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:190
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:192
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:194
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:196
msgid "configures xserver-xorg."
msgstr "konfiguriert xserver-xorg."
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:196
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:198
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1146,77 +1194,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:199
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:200
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:193
+#: en/live-config.7:201
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:202
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:203
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:204
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:197
+#: en/live-config.7:205
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:206
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:200
+#: en/live-config.7:208
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:210
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:212
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:213
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:207
+#: en/live-config.7:215
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 "
@@ -1227,13 +1275,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:208
+#: en/live-config.7:216
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:218
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 "
@@ -1247,13 +1295,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:211
+#: en/live-config.7:219
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:220
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 752f3e5..29cac5d 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-10 12:39+0300\n"
+"POT-Creation-Date: 2010-06-11 18:35+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-10"
+msgid "2010-06-11"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a8"
+msgid "2.0~a9"
msgstr ""
#. type: TH
@@ -284,33 +284,44 @@ msgstr ""
#. type: IP
#: en/live-config.7:55
#, no-wrap
-msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
+msgid "B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
msgstr ""
#. type: Plain text
#: en/live-config.7:57
-msgid "Allows to set xorg driver instead of autodetecting it."
+msgid "Allows to disable sysv services through update-rc.d."
msgstr ""
#. type: IP
#: en/live-config.7:57
#, no-wrap
-msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
+msgid "B<live-config.xorg-driver>=I<XORG_DRIVER>"
msgstr ""
#. type: Plain text
#: en/live-config.7:59
-msgid "Allows to set xorg resolution instead of autodetecting it."
+msgid "Allows to set xorg driver 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>"
+msgid "B<live-config.xorg-resolution>=I<XORG_RESOLUTION>"
msgstr ""
#. type: Plain text
#: en/live-config.7:61
+msgid "Allows to set xorg resolution instead of autodetecting it."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:61
+#, no-wrap
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:63
msgid ""
"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 /"
@@ -321,7 +332,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:65
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 "
@@ -329,13 +340,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:64
+#: en/live-config.7:66
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:66
+#: en/live-config.7:68
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -343,52 +354,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<live-config.noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
msgid "B<live-config.nottyautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid ""
"Disables the automatic login on the terminal, not affecting the graphical "
"autologin."
msgstr ""
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:73
#, no-wrap
msgid "B<live-config.nox11autologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:75
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:74
+#: en/live-config.7:76
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:76
+#: en/live-config.7:78
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -398,7 +409,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:78
+#: en/live-config.7:80
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/"
@@ -408,7 +419,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:80
+#: en/live-config.7:82
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 "
@@ -418,214 +429,227 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_CONFIGS>=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-config>=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_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
+#, no-wrap
+msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:109
+msgid ""
+"This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
+"I<SERVICEn>' parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:111
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:113
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:113
#, no-wrap
msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:115
msgid ""
"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' parameter."
msgstr ""
#. type: SH
-#: en/live-config.7:112
+#: en/live-config.7:116
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:118
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:115
+#: en/live-config.7:119
#, no-wrap
msgid "Adding new config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:121
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 "
@@ -633,7 +657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:123
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/"
@@ -641,13 +665,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:120
+#: en/live-config.7:124
#, no-wrap
msgid "Removing existing config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:126
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 "
@@ -658,7 +682,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:124
+#: en/live-config.7:128
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 "
@@ -666,422 +690,444 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:125
+#: en/live-config.7:129
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:131
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:128
+#: en/live-config.7:132
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:134
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:130
+#: en/live-config.7:134
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:132
+#: en/live-config.7:136
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:132
+#: en/live-config.7:136
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:134
+#: en/live-config.7:138
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:134
+#: en/live-config.7:138
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:136
+#: en/live-config.7:140
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:136
+#: en/live-config.7:140
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:142
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:142
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:144
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:144
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:142
+#: en/live-config.7:146
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:146
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:144
+#: en/live-config.7:148
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:148
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:150
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:150
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:152
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:152
+#, no-wrap
+msgid "B<slim>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:154
+msgid "configures autologin in slim."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:154
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:156
msgid "configures the keyboard."
msgstr ""
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:156
#, no-wrap
msgid "B<sysvinit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:158
msgid "configures sysvinit."
msgstr ""
#. type: IP
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:158
+#, no-wrap
+msgid "B<sysv-rc>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:160
+msgid "configures sysv-rc by disabling listed services."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:160 en/live-config.7:192
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:154 en/live-config.7:186
+#: en/live-config.7:162 en/live-config.7:194
msgid "disables lastlog."
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:162
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:164
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:164
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:166
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:166
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:168
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:168
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:170
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:170
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:172
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:172
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:174
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:174
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:176
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:176
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:178
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:178
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:180
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:180
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:182
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:182
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:184
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:184
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:186
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:186
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:188
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:188
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:190
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:190
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:192
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:194
#, no-wrap
msgid "B<xserver-xorg>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:196
msgid "configures xserver-xorg."
msgstr ""
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:196
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:198
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:191
+#: en/live-config.7:199
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:200
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:193
+#: en/live-config.7:201
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:202
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:203
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:204
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:197
+#: en/live-config.7:205
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:206
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:200
+#: en/live-config.7:208
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:210
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:212
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:213
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:207
+#: en/live-config.7:215
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 "
@@ -1089,13 +1135,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:208
+#: en/live-config.7:216
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:218
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 "
@@ -1104,13 +1150,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:211
+#: en/live-config.7:219
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:220
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 f4da885..f031c5f 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -98,6 +98,11 @@ Cmdline ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
;;
+ # 014-sysv-rc
+ live-config.sysv-rc=*)
+ LIVE_SYSV_RC="${_PARAMETER#live-config.sysv-rc=}"
+ ;;
+
# 116-xserver-xorg
live-config.xorg-driver=*)
LIVE_XORG_DRIVER="${_PARAMETER#live-config.xorg-driver=}"
@@ -128,7 +133,7 @@ Cmdline ()
# Disables graphical autologin, no matter what
# mechanism
_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
- LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm"
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm,slim"
;;
esac
done
diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index 164a33d..599ab4b 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -24,6 +24,10 @@ Nodm ()
Configure_nodm ()
{
+ # autologin
+ sed -i -r -e "s|^NODM_ENABLED=.*\$|NODM_ENABLED=true|" \
+ -e "s|^NODM_USER=.*\$|NODM_USER=${LIVE_USERNAME}|" \
+ /etc/default/nodm
cat > /tmp/debconf.live << EOF
nodm nodm/enabled boolean true
@@ -33,8 +37,6 @@ EOF
debconf-set-selections < /tmp/debconf.live
rm -f /tmp/debconf.live
- dpkg-reconfigure -f non-interactive -p critical nodm
-
# Creating state file
touch /var/lib/live/config/nodm
}
diff --git a/scripts/config/006-gdm b/scripts/config/010-slim
similarity index 52%
copy from scripts/config/006-gdm
copy to scripts/config/010-slim
index 099cf2f..122db8d 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/010-slim
@@ -8,38 +8,35 @@
# under certain conditions; see COPYING for details.
-Gdm ()
+Slim ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/gdm.list ] || \
- [ -e /var/lib/live/config/gdm ]
+ if [ ! -e /var/lib/dpkg/info/slim.list ] || \
+ [ -e /var/lib/live/config/slim ]
then
return
fi
- echo -n " gdm"
+ echo -n " slim"
- Configure_gdm
+ Configure_slim
}
-Configure_gdm ()
+Configure_slim ()
{
# Checking if if package is already configured differently
- if grep -qs AutomaticLoginEnable /etc/gdm/gdm.conf
+ if grep -qs "^auto_login" /etc/slim.conf
then
return
fi
- _GDM_OPTIONS="AutomaticLoginEnable=true\n\
-AutomaticLogin=${LIVE_USERNAME}\n\
-TimedLoginEnable=true\n\
-TimedLogin=${LIVE_USERNAME}\n\
-TimedLoginDelay=10"
-
- sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM_OPTIONS}|" /etc/gdm/gdm.conf
+ # autologin
+ sed -i -r -e "s|^#?auto_login.*\$|auto_login yes|" \
+ -e "s|^#?default_user.*\$|default_user ${LIVE_USERNAME}|" \
+ /etc/slim.conf
# Creating state file
- touch /var/lib/live/config/gdm
+ touch /var/lib/live/config/slim
}
-Gdm
+Slim
diff --git a/scripts/config/009-lxdm b/scripts/config/014-sysv-rc
similarity index 51%
copy from scripts/config/009-lxdm
copy to scripts/config/014-sysv-rc
index 43926c6..dddb27d 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/014-sysv-rc
@@ -8,31 +8,33 @@
# under certain conditions; see COPYING for details.
-Lxdm ()
+Sysv_rc ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/lxdm.list ] || \
- [ -e /var/lib/live/config/lxdm ]
+ if [ ! -e /var/lib/dpkg/info/sysv-rc.list ] || \
+ [ -e /var/lib/live/config/sysv-rc ]
then
return
fi
- echo -n " lxdm"
+ echo -n " sysv-rc"
- Configure_lxdm
+ Configure_sysv-rc
}
-Configure_lxdm ()
+Configure_sysv_rc ()
{
- if [ -e /etc/lxdm/lxdm.conf ]
+ if [ -n "${LIVE_SYSV_RC}" ]
then
- sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
- -e "s|^#?session.*\$|session|" \
- /etc/lxdm/lxdm.conf
+ for SERVICE in $(echo ${LIVE_SYSV_RC} | sed -e 's|,| |g')
+ do
+ update-rc.d -f ${SERVICE} remove | \
+ grep -v "update-rc.d: using dependency based boot sequencing"
+ done
fi
# Creating state file
- touch /var/lib/live/config/lxdm
+ touch /var/lib/live/config/sysv-rc
}
-Lxdm
+Sysv_rc
--
live-config
More information about the debian-live-changes
mailing list