[SCM] live-config branch, debian, updated. debian/2.0_a4-1
Daniel Baumann
daniel at debian.org
Wed Jun 2 20:48:54 UTC 2010
The following commit has been merged in the debian branch:
commit 7b6dfcc7e2fab715e98ae5a616a4755daaf3ed04
Author: Daniel Baumann <daniel at debian.org>
Date: Sun May 30 10:03:44 2010 +0200
Adding shortcut parameter to disable automatic graphical login, no matter which display manager would be used.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index ad2b2db..f063260 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -79,6 +79,9 @@ einfache Benutzbarkeit.
.IP \fBlive\-config.noroot\fP 4
Schaltet die sudo und policykit Skripte ab, ein Benutzer kann keine root
Privilegien auf dem System mehr erlangen.
+.IP \fBlive\-config.noxlogin\fP 4
+Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
+den automatischen tty Login.
.SS Konfigurationsdateien
\fBlive\-config\fP kann durch Konfigurationsdateien konfiguriert (nicht aber
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index de852d5..34b685a 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -44,6 +44,8 @@ For some common use cases where it would require to combine several individual p
.IP "\fBlive-config.noroot\fR" 4
Disables the sudo and policykit, the user cannot gain root privileges on the system.
+.IP "\fBlive-config.noxlogin\fR" 4
+Disables the automatic login with any display manager, not affecting tty autologin.
.SS Configuration Files
\fBlive\-config\fR can be configured (but not activated) through configuration files. Those 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/config.conf, live/config.conf.d/).
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 5ee314c..b7e7cbc 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a2\n"
-"POT-Creation-Date: 2010-05-30 09:34+0300\n"
+"POT-Creation-Date: 2010-05-30 10:00+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"
@@ -321,14 +321,29 @@ msgstr ""
"Schaltet die sudo und policykit Skripte ab, ein Benutzer kann keine root "
"Privilegien auf dem System mehr erlangen."
+#. type: IP
+#: en/live-config.7:47
+#, no-wrap
+msgid "B<live-config.noxlogin>"
+msgstr "B<live-config.noxlogin>"
+
+#. type: Plain text
+#: en/live-config.7:49
+msgid ""
+"Disables the automatic login with any display manager, not affecting tty "
+"autologin."
+msgstr ""
+"Schaltet den automatischen Login via Display Manager ab, dies beeinflusst "
+"den automatischen tty Login."
+
#. type: SS
-#: en/live-config.7:48
+#: en/live-config.7:50
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:50
+#: en/live-config.7:52
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
@@ -341,180 +356,180 @@ msgstr ""
"oder auf dem Live Medium (live/config.conf, live/config.conf.d/)."
#. type: SH
-#: en/live-config.7:51
+#: en/live-config.7:53
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:53
+#: en/live-config.7:55
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:53
+#: en/live-config.7:55
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:57
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:57
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:59
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:57
+#: en/live-config.7:59
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:59
+#: en/live-config.7:61
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:59
+#: en/live-config.7:61
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:61
+#: en/live-config.7:63
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:61
+#: en/live-config.7:63
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:65
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:63
+#: en/live-config.7:65
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:65
+#: en/live-config.7:67
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:67
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:69
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:73
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:75
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:79
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:81
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
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:81
+#: en/live-config.7:83
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -522,101 +537,101 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:85
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
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:87
+#: en/live-config.7:89
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
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:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<hook>"
msgstr "B<hook>"
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -625,71 +640,71 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:102
+#: en/live-config.7:104
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:104
+#: en/live-config.7:106
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:106
+#: en/live-config.7:108
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:108
+#: en/live-config.7:110
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: SH
-#: en/live-config.7:110
+#: en/live-config.7:112
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:114
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:116
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:115
+#: en/live-config.7:117
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
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 "
@@ -700,13 +715,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:118
+#: en/live-config.7:120
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:122
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 "
@@ -720,13 +735,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:121
+#: en/live-config.7:123
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:124
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 8e93ea3..7f7e084 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-05-30 09:34+0300\n"
+"POT-Creation-Date: 2010-05-30 10:00+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"
@@ -275,14 +275,27 @@ msgid ""
"system."
msgstr ""
+#. type: IP
+#: en/live-config.7:47
+#, no-wrap
+msgid "B<live-config.noxlogin>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:49
+msgid ""
+"Disables the automatic login with any display manager, not affecting tty "
+"autologin."
+msgstr ""
+
#. type: SS
-#: en/live-config.7:48
+#: en/live-config.7:50
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:50
+#: en/live-config.7:52
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
@@ -291,350 +304,350 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:51
+#: en/live-config.7:53
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:53
+#: en/live-config.7:55
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:53
+#: en/live-config.7:55
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:57
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:57
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:59
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:57
+#: en/live-config.7:59
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:59
+#: en/live-config.7:61
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:59
+#: en/live-config.7:61
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:61
+#: en/live-config.7:63
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:61
+#: en/live-config.7:63
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:63
+#: en/live-config.7:65
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:63
+#: en/live-config.7:65
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:65
+#: en/live-config.7:67
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:67
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:69
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:69
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:71
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:71
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:73
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:73
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:75
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:79
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:81
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:83
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:83
+#: en/live-config.7:85
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:89
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:91
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:93
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:95
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:97
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<hook>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
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:102
+#: en/live-config.7:104
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:104
+#: en/live-config.7:106
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:106
+#: en/live-config.7:108
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:108
+#: en/live-config.7:110
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:110
+#: en/live-config.7:112
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:112
+#: en/live-config.7:114
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:114
+#: en/live-config.7:116
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:115
+#: en/live-config.7:117
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
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 "
@@ -642,13 +655,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:118
+#: en/live-config.7:120
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:120
+#: en/live-config.7:122
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 "
@@ -657,13 +670,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:121
+#: en/live-config.7:123
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:122
+#: en/live-config.7:124
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 7d93165..934d651 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -72,6 +72,13 @@ Cmdline ()
SCRIPTS="${SCRIPTS:-$(ls /lib/live/config/*)}"
NOCONFIGS="${NOCONFIGS},sudo,policykit"
;;
+
+ live-config.noxlogin)
+ # Disables graphical autologin, no matter what
+ # mechanism
+ SCRIPTS="${SCRIPTS:-$(ls /lib/live/config/*)}"
+ NOCONFIGS="${NOCONFIGS},gdm,gdm3,kdm,lxdm,nodm"
+ ;;
esac
done
--
live-config
More information about the debian-live-changes
mailing list