[SCM] live-config branch, debian-next, updated. debian/2.0_a8-1-1-g384c82f
Daniel Baumann
daniel at debian.org
Thu Jun 10 12:57:47 UTC 2010
The following commit has been merged in the debian-next branch:
commit 384c82fad9dda8ff2114a7f12f541008be680cf6
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jun 10 14:57:19 2010 +0200
Adding slim config script.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index ed138df..9df4984 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -236,6 +236,8 @@ 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
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 09c2639..3c3f406 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -145,6 +145,8 @@ 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
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index f602012..01b93c1 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~a8\n"
-"POT-Creation-Date: 2010-06-10 12:39+0300\n"
+"POT-Creation-Date: 2010-06-10 14:56+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"
@@ -920,89 +920,100 @@ msgstr "konfiguriert Autologin in nodm."
#. type: IP
#: en/live-config.7:148
#, no-wrap
+msgid "B<slim>"
+msgstr "B<slim>"
+
+#. type: Plain text
+#: en/live-config.7:150
+msgid "configures autologin in slim."
+msgstr "konfiguriert Autologin in slim."
+
+#. type: IP
+#: en/live-config.7:150
+#, 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:152
msgid "configures the keyboard."
msgstr "konfiguriert die Tastatur."
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
msgid "configures sysvinit."
msgstr "konfiguriert sysvinit."
#. type: IP
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:154 en/live-config.7:186
#, 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:156 en/live-config.7:188
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
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:160
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
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:164
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -1010,134 +1021,134 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
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:168
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
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:170
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
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:172
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
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:174
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
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:176
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
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:178
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid "configures xserver-xorg."
msgstr "konfiguriert xserver-xorg."
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1146,77 +1157,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:193
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, 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:195
#, 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:196
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:197
#, 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:198
#, 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:199
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
#, 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:202
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:207
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:207
+#: en/live-config.7:209
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 +1238,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:210
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
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 +1258,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:211
+#: en/live-config.7:213
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
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..325c565 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-10 14:56+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"
@@ -790,298 +790,309 @@ msgstr ""
#. type: IP
#: en/live-config.7:148
#, no-wrap
-msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgid "B<slim>"
msgstr ""
#. type: Plain text
#: en/live-config.7:150
-msgid "configures the keyboard."
+msgid "configures autologin in slim."
msgstr ""
#. type: IP
#: en/live-config.7:150
#, 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:152
+msgid "configures the keyboard."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:152
+#, no-wrap
+msgid "B<sysvinit>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:154
msgid "configures sysvinit."
msgstr ""
#. type: IP
-#: en/live-config.7:152 en/live-config.7:184
+#: en/live-config.7:154 en/live-config.7:186
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:154 en/live-config.7:186
+#: en/live-config.7:156 en/live-config.7:188
msgid "disables lastlog."
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
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:166
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:174
+#: en/live-config.7:176
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<xserver-xorg>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid "configures xserver-xorg."
msgstr ""
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
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:193
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:193
+#: en/live-config.7:195
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:195
+#: en/live-config.7:197
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:197
+#: en/live-config.7:199
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:200
+#: en/live-config.7:202
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:205
+#: en/live-config.7:207
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:207
+#: en/live-config.7:209
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 +1100,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
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 +1115,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:211
+#: en/live-config.7:213
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
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..99fa794 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -128,7 +128,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/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
--
live-config
More information about the debian-live-changes
mailing list