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.148.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
15autologin
diff --git
a/scripts/live-bottom/15autologin
b/scripts/live-bottom/15autologin
index
4b203d7
..
7fb2b13
100755
(executable)
--- a/
scripts/live-bottom/15autologin
+++ b/
scripts/live-bottom/15autologin
@@
-20,17
+20,19
@@
esac
# live-initramfs header
# live-initramfs header
-. /scripts/live-functions
-
-log_begin_msg "Setting up automatic login..."
+. /live.vars
-# live-initramfs script
-
-if [ -n "${NOXAUTOLOGIN}" ]
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
then
exit 0
fi
then
exit 0
fi
+. /scripts/live-functions
+
+log_begin_msg "Setting up automatic login"
+
+# live-initramfs script
+
# 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