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
ae653fd
..
3f85d50
100755
(executable)
--- a/
scripts/live-bottom/15autologin
+++ b/
scripts/live-bottom/15autologin
@@
-20,17
+20,19
@@
esac
# live-initramfs header
# live-initramfs header
+. /live.vars
+
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
log_begin_msg "Setting up automatic login"
# live-initramfs script
. /scripts/live-functions
log_begin_msg "Setting up automatic login"
# live-initramfs script
-if [ -n "${NOXAUTOLOGIN}" ]
-then
- exit 0
-fi
-
# chroot needed to handle symlinks correctly
if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
then
# chroot needed to handle symlinks correctly
if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
then
@@
-53,10
+55,24
@@
then
-e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
-e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
-e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
${GDMCONF}
+elif [ -d /root/etc/gdm3 ]
+then
+
+cat > /root/etc/gdm3/custom.conf << EOF
+[daemon]
+AutomaticLoginEnable=true
+AutomaticLogin=$USERNAME
+TimedLoginEnable=true
+TimedLogin=$USERNAME
+TimedLoginDelay=10
+EOF
+
fi
if [ -d /root/etc/default/kdm.d/ ]
then
fi
if [ -d /root/etc/default/kdm.d/ ]
then
+ if ! grep -qs "^AUTOLOGIN" /root/etc/default/kdm.d/live-autologin
+ then
cat >> /root/etc/default/kdm.d/live-autologin << EOF
AUTOLOGINUSER=${USERNAME}
cat >> /root/etc/default/kdm.d/live-autologin << EOF
AUTOLOGINUSER=${USERNAME}
@@
-64,6
+80,8
@@
AUTOLOGINAGAIN=true
AUTOLOGINDELAY=0
EOF
AUTOLOGINDELAY=0
EOF
+ fi
+
elif [ -f /root/etc/kde3/kdm/kdmrc ]
then
# Configure KDM autologin
elif [ -f /root/etc/kde3/kdm/kdmrc ]
then
# Configure KDM autologin