X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=b24d428398ea703797a6711a9e2bb15f385ea592;hb=25bcd436af6202932ad494c8ddd0a49999579924;hp=60324373c1f1a0fca07226d98a55439ac9bfa0c8;hpb=ea5ccacffb14572b4800d14fc9eea23cad7ca893;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 6032437..b24d428 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -1,24 +1,33 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Setting up automatic login..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up automatic login..."
+
+# live-initramfs script
+
+if [ -z "${NOXAUTOLOGIN}" ]
+then
 
 if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
     GDMCONF=/etc/gdm/gdm-cdd.conf
@@ -51,6 +60,8 @@ if [ -f /root/etc/kde3/kdm/kdmrc ]; then
         /root/etc/kde3/kdm/kdmrc
 fi
 
+fi
+
 if chroot /root /usr/bin/which kpersonalizer >/dev/null; then
     # Disable first-login wizard for KDE
     if [ ! -f /root/etc/kde3/kpersonalizerrc ]; then