[SCM] live-config branch, upstream, updated. upstream/2.0.5-1-g6f6e7f0

Daniel Baumann daniel at debian.org
Wed Sep 15 10:13:28 UTC 2010


The following commit has been merged in the upstream branch:
commit 6f6e7f0931c0e9b136d900eada8ba873709e5ece
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 15 12:10:45 2010 +0200

    Adding upstream version 2.0.6.

diff --git a/VERSION b/VERSION
index e010258..157e54f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.5
+2.0.6
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 5e25d7b..30bb8db 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 06.09.2010 2.0.5 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 15.09.2010 2.0.6 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-config\fP \- System Konfiguration Skripte
@@ -267,6 +267,8 @@ konfiguriert Autologin in lxdm.
 konfiguriert Autologin in nodm.
 .IP \fBslim\fP 4
 konfiguriert Autologin in slim.
+.IP \fBxinit\fP 4
+konfiguriert Autologin mit xinit.
 .IP "\fBconsole\-common\fP, \fBconsole\-setup\fP (lenny), \fBkeyboard\-configuration\fP (squeeze und neuer)" 4
 konfiguriert die Tastatur.
 .IP \fBsysvinit\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index e6216f0..a6578aa 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\-09\-06 2.0.5 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-09\-15 2.0.6 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts
@@ -167,6 +167,8 @@ configures autologin in lxdm.
 configures autologin in nodm.
 .IP "\fBslim\fR" 4
 configures autologin in slim.
+.IP "\fBxinit\fR" 4
+configures autologin with xinit.
 .IP "\fBconsole\-common\fR, \fBconsole\-setup\fR (lenny), \fBkeyboard\-configuration\fR (squeeze and newer)" 4
 configures the keyboard.
 .IP "\fBsysvinit\fR" 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 04e659b..7ec4a60 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 06.09.2010 2.0.5 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 15.09.2010 2.0.6 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système
@@ -269,6 +269,8 @@ configure l'auto\-login dans lxdm.
 configure l'auto\-login dans nodm.
 .IP \fBslim\fP 4
 configure l'auto\-login dans slim.
+.IP \fBxinit\fP 4
+configure l'auto\-login avec xinit.
 .IP "\fBconsole\-common\fP, \fBconsole\-setup\fP (lenny), \fBkeyboard\-configuration\fP (squeeze et plus récent)" 4
 configure le clavier.
 .IP \fBsysvinit\fP 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index c058644..946bd44 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.5\n"
-"POT-Creation-Date: 2010-09-06 15:04+0300\n"
+"Project-Id-Version: live-config 2.0.6\n"
+"POT-Creation-Date: 2010-09-15 12:06+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-09-06"
-msgstr "06.09.2010"
+msgid "2010-09-15"
+msgstr "15.09.2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.5"
-msgstr "2.0.5"
+msgid "2.0.6"
+msgstr "2.0.6"
 
 #. type: TH
 #: en/live-config.7:9
@@ -1038,100 +1038,111 @@ msgstr "konfiguriert Autologin in slim."
 #. type: IP
 #: en/live-config.7:170
 #, no-wrap
+msgid "B<xinit>"
+msgstr "B<xinit>"
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "configures autologin with xinit."
+msgstr "konfiguriert Autologin mit xinit."
+
+#. type: IP
+#: en/live-config.7:172
+#, 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:172
+#: en/live-config.7:174
 msgid "configures the keyboard."
 msgstr "konfiguriert die Tastatur."
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr "B<sysvinit>"
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "configures sysvinit."
 msgstr "konfiguriert sysvinit."
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr "B<sysv-rc>"
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "configures sysv-rc by disabling listed services."
 msgstr "konfiguriert sysv-rc durch abschalten von angegebenen Services."
 
 #. type: IP
-#: en/live-config.7:176 en/live-config.7:208
+#: en/live-config.7:178 en/live-config.7:210
 #, no-wrap
 msgid "B<login>"
 msgstr "B<login>"
 
 #. type: Plain text
-#: en/live-config.7:178 en/live-config.7:210
+#: en/live-config.7:180 en/live-config.7:212
 msgid "disables lastlog."
 msgstr "schaltet lastlog ab."
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<apport> (ubuntu only)"
 msgstr "B<apport> (nur Ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables apport."
 msgstr "schaltet apport ab."
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr "B<gnome-panel-data>"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables lock button for the screen."
 msgstr "entfernt den Sperrknopf für den Bildschirm."
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr "B<gnome-power-manager>"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables hibernation."
 msgstr "verhindert Hibernation."
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr "B<gnome-screensaver>"
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 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:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr "B<initramfs-tools>"
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
@@ -1139,145 +1150,145 @@ msgstr ""
 "benutzt wird."
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<kaboom>"
 msgstr "B<kaboom>"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<kde-services>"
 msgstr "B<kde-services>"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 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:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr "B<kpersonalizer>"
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables kde configuration wizard (lenny)."
 msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<debian-installer-launcher>"
 msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "adds debian-installer-launcher on users desktop."
 msgstr "fügt debian-installer-launcher auf dem Benutzer Desktop hinzu."
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr "B<module-init-tools>"
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "automatically load some modules on some architectures."
 msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
 
 #. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
 #, no-wrap
 msgid "B<policykit>"
 msgstr "B<policykit>"
 
 #. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
 msgid "grant user privilegies through policykit."
 msgstr "räumt dem Benutzer Privilegien durch policykit ein."
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<sslcert>"
 msgstr "B<sslcert>"
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "regenerating ssl snake-oil certificates."
 msgstr "erneuert SSL snake-oil Zertifikate."
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr "B<update-notifier>"
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid "disables update-notifier."
 msgstr "schaltet update-notifier ab."
 
 #. type: IP
-#: en/live-config.7:204
+#: en/live-config.7:206
 #, no-wrap
 msgid "B<anacron>"
 msgstr "B<anacron>"
 
 #. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
 msgid "disables anacron."
 msgstr "schaltet anacron aus."
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B<util-linux>"
 msgstr "B<util-linux>"
 
 #. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
 msgid "disables util-linux' hwclock."
 msgstr "schaltet hwclock von util-linux ab."
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr "B<xserver-xorg>"
 
 #. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
 msgid "configures xserver-xorg."
 msgstr "konfiguriert xserver-xorg."
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B<ureadahead> (ubuntu only)"
 msgstr "B<ureadahead> (nur Ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:214
+#: en/live-config.7:216
 msgid "disables ureadahead."
 msgstr "schaltet ureadahead ab."
 
 #. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1286,77 +1297,77 @@ msgstr ""
 "einem HTTP/FTP Server auszuführen."
 
 #. type: SH
-#: en/live-config.7:217
+#: en/live-config.7:219
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "B</etc/live/config.d/>"
 msgstr "B</etc/live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:221
+#: en/live-config.7:223
 #, no-wrap
 msgid "B<live/config.d/>"
 msgstr "B<live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:223
+#: en/live-config.7:225
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:226
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:226
+#: en/live-config.7:228
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:232
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: SH
-#: en/live-config.7:231
+#: en/live-config.7:233
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-config.7:233
+#: en/live-config.7:235
 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 "
@@ -1367,13 +1378,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-config.7:234
+#: en/live-config.7:236
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-config.7:236
+#: en/live-config.7:238
 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 "
@@ -1387,13 +1398,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-config.7:237
+#: en/live-config.7:239
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:240
 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/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 84577e6..f715803 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0.5\n"
-"POT-Creation-Date: 2010-09-06 15:04+0300\n"
+"Project-Id-Version: live-config 2.0.6\n"
+"POT-Creation-Date: 2010-09-15 12:06+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-06"
-msgstr "06.09.2010"
+msgid "2010-09-15"
+msgstr "15.09.2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.5"
-msgstr "2.0.5"
+msgid "2.0.6"
+msgstr "2.0.6"
 
 #. type: TH
 #: en/live-config.7:9
@@ -1040,99 +1040,110 @@ msgstr "configure l'auto-login dans slim."
 #. type: IP
 #: en/live-config.7:170
 #, no-wrap
+msgid "B<xinit>"
+msgstr "B<xinit>"
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "configures autologin with xinit."
+msgstr "configure l'auto-login avec xinit."
+
+#. type: IP
+#: en/live-config.7:172
+#, 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 et plus récent)"
 
 #. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
 msgid "configures the keyboard."
 msgstr "configure le clavier."
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr "B<sysvinit>"
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "configures sysvinit."
 msgstr "configure sysvinit."
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr "B<sysv-rc>"
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "configures sysv-rc by disabling listed services."
 msgstr "configure sysv-rc en désactivant les services listés."
 
 #. type: IP
-#: en/live-config.7:176 en/live-config.7:208
+#: en/live-config.7:178 en/live-config.7:210
 #, no-wrap
 msgid "B<login>"
 msgstr "B<login>"
 
 #. type: Plain text
-#: en/live-config.7:178 en/live-config.7:210
+#: en/live-config.7:180 en/live-config.7:212
 msgid "disables lastlog."
 msgstr "désactive lastlog."
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<apport> (ubuntu only)"
 msgstr "B<apport> (seulement ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables apport."
 msgstr "désactive apport."
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr "B<gnome-panel-data>"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables lock button for the screen."
 msgstr "désactive le bouton de verrouillage de l'écran."
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr "B<gnome-power-manager>"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables hibernation."
 msgstr "désactive l'hibernation."
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr "B<gnome-screensaver>"
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "disables the screensaver locking the screen."
 msgstr "désactive le verrouillage de session par l'économiseur d'écran."
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr "B<initramfs-tools>"
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
@@ -1140,147 +1151,147 @@ msgstr ""
 "persistance."
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<kaboom>"
 msgstr "B<kaboom>"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr "désactive l'assistant de migration de kde (squeeze et plus récent)."
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<kde-services>"
 msgstr "B<kde-services>"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr "désactive des services de KDE non souhaités (squeeze et plus récent)."
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr "B<kerpsonalizer>"
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables kde configuration wizard (lenny)."
 msgstr "désactive le lancement du paramétrage de configuration de kde (lenny)."
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<debian-installer-launcher>"
 msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
 "ajoute l'installeur (debian-installer-launcher) sur le bureau des "
 "utilisateurs."
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr "B<module-init-tools>"
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "automatically load some modules on some architectures."
 msgstr "charge automatiquement certains modules sur certaines architectures."
 
 #. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
 #, no-wrap
 msgid "B<policykit>"
 msgstr "B<policykit>"
 
 #. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
 msgid "grant user privilegies through policykit."
 msgstr "accorde à l'utilisateur des privilèges via le policykit."
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<sslcert>"
 msgstr "B<sslcert>"
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "regenerating ssl snake-oil certificates."
 msgstr "regénère les certificats ssl."
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr "B<update-notifier>"
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid "disables update-notifier."
 msgstr "désactive update-notifier."
 
 #. type: IP
-#: en/live-config.7:204
+#: en/live-config.7:206
 #, no-wrap
 msgid "B<anacron>"
 msgstr "B<anacron>"
 
 #. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
 msgid "disables anacron."
 msgstr "désactive anacron."
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B<util-linux>"
 msgstr "B<util-linux>"
 
 #. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
 msgid "disables util-linux' hwclock."
 msgstr "désactive util-linux' heure hardware."
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr "B<xserver-xorg>"
 
 #. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
 msgid "configures xserver-xorg."
 msgstr "configure xserver-xorg."
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B<ureadahead> (ubuntu only)"
 msgstr "B<ureadahead> (seulement ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:214
+#: en/live-config.7:216
 msgid "disables ureadahead."
 msgstr "désactive ureadahead."
 
 #. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1289,77 +1300,77 @@ msgstr ""
 "média live, ou sur un serveur http/ftp."
 
 #. type: SH
-#: en/live-config.7:217
+#: en/live-config.7:219
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "B</etc/live/config.d/>"
 msgstr "B</etc/live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:221
+#: en/live-config.7:223
 #, no-wrap
 msgid "B<live/config.d/>"
 msgstr "B<live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:223
+#: en/live-config.7:225
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:226
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:226
+#: en/live-config.7:228
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:232
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: SH
-#: en/live-config.7:231
+#: en/live-config.7:233
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCEUIL"
 
 #. type: Plain text
-#: en/live-config.7:233
+#: en/live-config.7:235
 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 "
@@ -1370,13 +1381,13 @@ msgstr ""
 "sur E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
-#: en/live-config.7:234
+#: en/live-config.7:236
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: en/live-config.7:236
+#: en/live-config.7:238
 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 "
@@ -1389,13 +1400,13 @@ msgstr ""
 "E<lt>I<debian-live at lists.debian.org>E<gt>"
 
 #. type: SH
-#: en/live-config.7:237
+#: en/live-config.7:239
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:240
 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/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 0580f48..86d123e 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0.5\n"
-"POT-Creation-Date: 2010-09-06 15:04+0300\n"
+"Project-Id-Version: live-config 2.0.6\n"
+"POT-Creation-Date: 2010-09-15 12:06+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-06"
-msgstr "06-09-2010"
+msgid "2010-09-15"
+msgstr "15-09-2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.5"
-msgstr "2.0.5"
+msgid "2.0.6"
+msgstr "2.0.6"
 
 #. type: TH
 #: en/live-config.7:9
@@ -1027,99 +1027,110 @@ msgstr "configura autologin no slim."
 #. type: IP
 #: en/live-config.7:170
 #, no-wrap
+msgid "B<xinit>"
+msgstr "B<xinit>"
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "configures autologin with xinit."
+msgstr "configura autologin no xinit."
+
+#. type: IP
+#: en/live-config.7:172
+#, 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 e mais recentes)"
 
 #. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
 msgid "configures the keyboard."
 msgstr "configura o teclado."
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B<sysvinit>"
 msgstr "B<sysvinit>"
 
 #. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
 msgid "configures sysvinit."
 msgstr "configura sysvinit."
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<sysv-rc>"
 msgstr "B<sysv-rc>"
 
 #. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
 msgid "configures sysv-rc by disabling listed services."
 msgstr "configura sysv-rc desabilitando serviços listados."
 
 #. type: IP
-#: en/live-config.7:176 en/live-config.7:208
+#: en/live-config.7:178 en/live-config.7:210
 #, no-wrap
 msgid "B<login>"
 msgstr "B<login>"
 
 #. type: Plain text
-#: en/live-config.7:178 en/live-config.7:210
+#: en/live-config.7:180 en/live-config.7:212
 msgid "disables lastlog."
 msgstr "desabilita lastlog."
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<apport> (ubuntu only)"
 msgstr "B<apport> (apenas ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables apport."
 msgstr "desabilita apport."
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr "B<gnome-panel-data>"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables lock button for the screen."
 msgstr "desabilita botão de trava para a tela."
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr "B<gnome-power-manager>"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables hibernation."
 msgstr "desabilita hibernação."
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr "B<gnome-screensaver>"
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "disables the screensaver locking the screen."
 msgstr "desabilita o bloqueio de tela do screensaver."
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr "B<initramfs-tools>"
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
@@ -1127,148 +1138,148 @@ msgstr ""
 "persistência for usada."
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<kaboom>"
 msgstr "B<kaboom>"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr "desabilita o assitente de migração do kde."
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<kde-services>"
 msgstr "B<kde-services>"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr ""
 "desabilita alguns serviços do KDE não desejados (squeeze e mais recentes)."
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr "B<kpersonalizer>"
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables kde configuration wizard (lenny)."
 msgstr "desabilita o assistente de configura do kde (lenny)."
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<debian-installer-launcher>"
 msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
 "adiciona o instalador (debian-installer-launcher) na área de trabalho dos "
 "usuários."
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr "B<module-init-tools>"
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "automatically load some modules on some architectures."
 msgstr "carrega alguns módulos automaticamente em algumas arquiteturas."
 
 #. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
 #, no-wrap
 msgid "B<policykit>"
 msgstr "B<policykit>"
 
 #. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
 msgid "grant user privilegies through policykit."
 msgstr "concede privilégios de usuário através de policykit."
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<sslcert>"
 msgstr "B<sslcert>"
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "regenerating ssl snake-oil certificates."
 msgstr "gera novos certificados ssl."
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr "B<update-notifier>"
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid "disables update-notifier."
 msgstr "desabilita update-notifier."
 
 #. type: IP
-#: en/live-config.7:204
+#: en/live-config.7:206
 #, no-wrap
 msgid "B<anacron>"
 msgstr "B<anacron>"
 
 #. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
 msgid "disables anacron."
 msgstr "desabilita anacron."
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B<util-linux>"
 msgstr "B<util-linux>"
 
 #. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
 msgid "disables util-linux' hwclock."
 msgstr "desabilita o relógio de hardware do util-linux."
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr "B<xserver-xorg>"
 
 #. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
 msgid "configures xserver-xorg."
 msgstr "configura o xserver-xorg."
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B<ureadahead> (ubuntu only)"
 msgstr "B<ureadahead> (apenas ubuntu)"
 
 #. type: Plain text
-#: en/live-config.7:214
+#: en/live-config.7:216
 msgid "disables ureadahead."
 msgstr "desabilita ureadahead."
 
 #. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1277,77 +1288,77 @@ msgstr ""
 "mídia live ou um servidor http/ftp."
 
 #. type: SH
-#: en/live-config.7:217
+#: en/live-config.7:219
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
 
 #. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "B</etc/live/config.d/>"
 msgstr "B</etc/live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:221
+#: en/live-config.7:223
 #, no-wrap
 msgid "B<live/config.d/>"
 msgstr "B<live/config.d/>"
 
 #. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:223
+#: en/live-config.7:225
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:226
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:226
+#: en/live-config.7:228
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER TAMBÉM"
 
 #. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:232
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: SH
-#: en/live-config.7:231
+#: en/live-config.7:233
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-config.7:233
+#: en/live-config.7:235
 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 "
@@ -1358,13 +1369,13 @@ msgstr ""
 "disponível em E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
-#: en/live-config.7:234
+#: en/live-config.7:236
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: en/live-config.7:236
+#: en/live-config.7:238
 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 "
@@ -1377,13 +1388,13 @@ msgstr ""
 "Live em E<lt>I<debian-live at lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-config.7:237
+#: en/live-config.7:239
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:240
 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 3fc3295..313dcb4 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-09-06 15:04+0300\n"
+"POT-Creation-Date: 2010-09-15 12:06+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-06"
+msgid "2010-09-15"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.5"
+msgid "2.0.6"
 msgstr ""
 
 #. type: TH
@@ -895,320 +895,331 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:170
 #, no-wrap
-msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgid "B<xinit>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:172
-msgid "configures the keyboard."
+msgid "configures autologin with xinit."
 msgstr ""
 
 #. type: IP
 #: en/live-config.7:172
 #, no-wrap
-msgid "B<sysvinit>"
+msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:174
-msgid "configures sysvinit."
+msgid "configures the keyboard."
 msgstr ""
 
 #. type: IP
 #: en/live-config.7:174
 #, no-wrap
-msgid "B<sysv-rc>"
+msgid "B<sysvinit>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:176
+msgid "configures sysvinit."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:176
+#, no-wrap
+msgid "B<sysv-rc>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:178
 msgid "configures sysv-rc by disabling listed services."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:176 en/live-config.7:208
+#: en/live-config.7:178 en/live-config.7:210
 #, no-wrap
 msgid "B<login>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:178 en/live-config.7:210
+#: en/live-config.7:180 en/live-config.7:212
 msgid "disables lastlog."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B<apport> (ubuntu only)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
 msgid "disables apport."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "B<gnome-panel-data>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "disables lock button for the screen."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
 #, no-wrap
 msgid "B<gnome-power-manager>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "disables hibernation."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
 #, no-wrap
 msgid "B<gnome-screensaver>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
 msgid "disables the screensaver locking the screen."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
 #, no-wrap
 msgid "B<initramfs-tools>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
 msgid ""
 "makes update-initramfs to also update the live media when using persistency."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "B<kaboom>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 msgid "disables kde migration wizard (squeeze and newer)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
 #, no-wrap
 msgid "B<kde-services>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 msgid "disables some unwanted KDE services (squeeze and newer)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
 #, no-wrap
 msgid "B<kpersonalizer>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
 msgid "disables kde configuration wizard (lenny)."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
 #, no-wrap
 msgid "B<debian-installer-launcher>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
 msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
 #, no-wrap
 msgid "B<module-init-tools>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
 msgid "automatically load some modules on some architectures."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
 #, no-wrap
 msgid "B<policykit>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
 msgid "grant user privilegies through policykit."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
 #, no-wrap
 msgid "B<sslcert>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
 msgid "regenerating ssl snake-oil certificates."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
 #, no-wrap
 msgid "B<update-notifier>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
 msgid "disables update-notifier."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:204
+#: en/live-config.7:206
 #, no-wrap
 msgid "B<anacron>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:206
+#: en/live-config.7:208
 msgid "disables anacron."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
 #, no-wrap
 msgid "B<util-linux>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
 msgid "disables util-linux' hwclock."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
 #, no-wrap
 msgid "B<xserver-xorg>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
 msgid "configures xserver-xorg."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:212
+#: en/live-config.7:214
 #, no-wrap
 msgid "B<ureadahead> (ubuntu only)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:214
+#: en/live-config.7:216
 msgid "disables ureadahead."
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
 #, no-wrap
 msgid "B<hooks>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:216
+#: en/live-config.7:218
 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:217
+#: en/live-config.7:219
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
 #, no-wrap
 msgid "B</etc/live/config.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:221
+#: en/live-config.7:223
 #, no-wrap
 msgid "B<live/config.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:222
+#: en/live-config.7:224
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:223
+#: en/live-config.7:225
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:224
+#: en/live-config.7:226
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:226
+#: en/live-config.7:228
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:228
+#: en/live-config.7:230
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:230
+#: en/live-config.7:232
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:231
+#: en/live-config.7:233
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:233
+#: en/live-config.7:235
 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 "
@@ -1216,13 +1227,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:234
+#: en/live-config.7:236
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:236
+#: en/live-config.7:238
 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 "
@@ -1231,13 +1242,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:237
+#: en/live-config.7:239
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:238
+#: en/live-config.7:240
 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/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 697feb2..34a9ca4 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 06\-09\-2010 2.0.5 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 15\-09\-2010 2.0.6 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -257,6 +257,8 @@ configura autologin no lxdm.
 configura autologin no nodm.
 .IP \fBslim\fP 4
 configura autologin no slim.
+.IP \fBxinit\fP 4
+configura autologin no xinit.
 .IP "\fBconsole\-common\fP, \fBconsole\-setup\fP (lenny), \fBkeyboard\-configuration\fP (squeeze e mais recentes)" 4
 configura o teclado.
 .IP \fBsysvinit\fP 4
diff --git a/scripts/config.sh b/scripts/config.sh
index 5d1404d..9e9c030 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -131,7 +131,7 @@ Cmdline ()
 			live-config.noautologin|noautologin)
 				# Disables both console and graphical autologin.
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
-				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim,xinit"
 				;;
 
 			live-config.nottyautologin|nottyautologin)
@@ -144,7 +144,7 @@ Cmdline ()
 				# Disables graphical autologin, no matter what
 				# mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
-				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm,slim"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm,slim,xinit"
 				;;
 
 			# Special options
diff --git a/scripts/config/006-gdm b/scripts/config/006-gdm
index c5abfdf..19ace78 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/006-gdm
@@ -38,6 +38,10 @@ TimedLoginDelay=10"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM_OPTIONS}|" /etc/gdm/gdm.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/gdm
 }
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index 978c113..44dca50 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -38,6 +38,10 @@ TimedLoginDelay=10"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM3_OPTIONS}|" /etc/gdm3/daemon.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/gdm3
 }
diff --git a/scripts/config/008-kdm b/scripts/config/008-kdm
index d887996..8a723bf 100755
--- a/scripts/config/008-kdm
+++ b/scripts/config/008-kdm
@@ -58,6 +58,10 @@ Configure_kdm ()
 		fi
 	fi
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/kdm
 }
diff --git a/scripts/config/009-lxdm b/scripts/config/009-lxdm
index 7ed37de..faf3d87 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/009-lxdm
@@ -31,6 +31,10 @@ Configure_lxdm ()
 		/etc/lxdm/lxdm.conf
 	fi
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/lxdm
 }
diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index ed0bfea..af95b03 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -37,6 +37,10 @@ EOF
 	debconf-set-selections < /tmp/debconf.live
 	rm -f /tmp/debconf.live
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/nodm
 }
diff --git a/scripts/config/011-slim b/scripts/config/011-slim
index 7b72edc..b90ceb9 100755
--- a/scripts/config/011-slim
+++ b/scripts/config/011-slim
@@ -35,6 +35,10 @@ Configure_slim ()
 		  -e "s|^#?default_user.*\$|default_user ${LIVE_USERNAME}|" \
 	/etc/slim.conf
 
+	# Avoid xinit
+	_X11="true"
+	export _X11
+
 	# Creating state file
 	touch /var/lib/live/config/slim
 }
diff --git a/scripts/config/012-xinit b/scripts/config/012-xinit
new file mode 100755
index 0000000..fa1dbc5
--- /dev/null
+++ b/scripts/config/012-xinit
@@ -0,0 +1,67 @@
+#!/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.
+
+
+Xinit ()
+{
+	# Checking if package is installed or already configured
+	if [ ! -e /var/lib/dpkg/info/xinit.list ] || \
+	   [ -e /var/lib/live/config/xinit ] || \
+	   [ "${_X11}" = "true" ]
+	then
+		return
+	fi
+
+	echo -n " xinit"
+
+	Configure_xinit
+}
+
+Configure_xinit ()
+{
+	# Checking if if package is already configured differently
+	if [ -e /etc/profile.d/zz-xinit.sh ] || grep -qs "startx" /etc/skel/.bash_profile
+	then
+		return
+	fi
+
+	if [ -e /etc/profile.d ]
+	then
+
+# squeeze
+cat > /etc/profile.d/zz-xinit.sh << EOF
+if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
+then
+	while true
+	do
+		startx
+	done
+fi
+EOF
+
+	else
+
+# lenny
+cat >> /etc/skel/.bash_profile << EOF
+if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
+then
+	while true
+	do
+		startx
+	done
+fi
+EOF
+
+	fi
+
+	# Creating state file
+	touch /var/lib/live/config/xinit
+}
+
+Xinit
diff --git a/scripts/config/012-console-common b/scripts/config/013-console-common
similarity index 100%
rename from scripts/config/012-console-common
rename to scripts/config/013-console-common
diff --git a/scripts/config/013-console-setup b/scripts/config/014-console-setup
similarity index 100%
rename from scripts/config/013-console-setup
rename to scripts/config/014-console-setup
diff --git a/scripts/config/014-keyboard-configuration b/scripts/config/015-keyboard-configuration
similarity index 100%
rename from scripts/config/014-keyboard-configuration
rename to scripts/config/015-keyboard-configuration
diff --git a/scripts/config/015-sysvinit b/scripts/config/016-sysvinit
similarity index 100%
rename from scripts/config/015-sysvinit
rename to scripts/config/016-sysvinit
diff --git a/scripts/config/016-sysv-rc b/scripts/config/017-sysv-rc
similarity index 100%
rename from scripts/config/016-sysv-rc
rename to scripts/config/017-sysv-rc
diff --git a/scripts/config/107-kde-services b/scripts/config/107-kde-services
index 987f9e8..f387de4 100755
--- a/scripts/config/107-kde-services
+++ b/scripts/config/107-kde-services
@@ -48,7 +48,7 @@ EOF
 
 	# Disabling unnecessary KDE services
 	rm -f /usr/share/autostart/kab2kabc.desktop
-	rm -f /usr/share/autostart/kabcdistlistupdater.desktop
+	rm -f /usr/share/autostart/kaddressbookmigrator.desktop
 	rm -f /usr/share/autostart/korgac.desktop
 	rm -f /usr/share/autostart/printer-applet.desktop
 	rm -f /usr/share/autostart/nepomukserver.desktop
@@ -57,6 +57,7 @@ EOF
 	rm -f /usr/share/kde4/services/kded/freespacenotifier.desktop
 	rm -f /usr/share/kde4/services/plasma-runner-contacts.desktop  # starts akonadi
 	rm -f /usr/share/kde4/services/kded/notificationhelper.desktop
+	rm -f /usr/share/kde4/services/plasma-dataengine-calendar.desktop # starts akonadi
 
 	# should enable kxkb in ~/.kde/share/config/kxkbrc
 	# if multiple layouts are specified. gnome does it per default.

-- 
live-config



More information about the debian-live-changes mailing list