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.110.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
15autologin
diff --git
a/scripts/live-bottom/15autologin
b/scripts/live-bottom/15autologin
index
40383cb
..
b0ce90d
100755
(executable)
--- a/
scripts/live-bottom/15autologin
+++ b/
scripts/live-bottom/15autologin
@@
-51,9
+51,9
@@
then
# Configure GDM autologin
chroot /root \
sed -i -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
# Configure GDM autologin
chroot /root \
sed -i -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
- -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$
USERNAME
/" \
+ -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$
{USERNAME}
/" \
-e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
-e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
- -e "s/^TimedLogin=.*\$/TimedLogin=$
USERNAME
/" \
+ -e "s/^TimedLogin=.*\$/TimedLogin=$
{USERNAME}
/" \
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
fi
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
fi
@@
-62,7
+62,7
@@
if [ -f /root/etc/kde3/kdm/kdmrc ]
then
# Configure KDM autologin
sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
then
# Configure KDM autologin
sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
- -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$
USERNAME
/" \
+ -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$
{USERNAME}
/" \
-e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
/root/etc/kde3/kdm/kdmrc
fi
-e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
/root/etc/kde3/kdm/kdmrc
fi