projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.206.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
15autologin
diff --git
a/scripts/live-bottom/15autologin
b/scripts/live-bottom/15autologin
index
dd66a83
..
3f85d50
100755
(executable)
--- a/
scripts/live-bottom/15autologin
+++ b/
scripts/live-bottom/15autologin
@@
-55,10
+55,10
@@
then
-e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
-e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
-elif [ -
e
/root/etc/gdm3 ]
+elif [ -
d
/root/etc/gdm3 ]
then
then
-cat > /root/etc/gdm3/
daemon
.conf << EOF
+cat > /root/etc/gdm3/
custom
.conf << EOF
[daemon]
AutomaticLoginEnable=true
AutomaticLogin=$USERNAME
[daemon]
AutomaticLoginEnable=true
AutomaticLogin=$USERNAME