X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=03b66f480505170fd3a729e5372dcfad3dd9d62b;hb=refs%2Ftags%2Fupstream%2F1.110.3;hp=b24d428398ea703797a6711a9e2bb15f385ea592;hpb=cdb98bbbdc41b29c6b94dc5aed36393daec84cf8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index b24d428..03b66f4 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -26,53 +26,42 @@ log_begin_msg "Setting up automatic login..."
 
 # live-initramfs script
 
-if [ -z "${NOXAUTOLOGIN}" ]
+if [ -n "${NOXAUTOLOGIN}" ]
 then
-
-if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
-    GDMCONF=/etc/gdm/gdm-cdd.conf
-else
-    GDMCONF=/etc/gdm/gdm.conf
-fi
-
-if chroot /root [ -f ${GDMCONF} ]; then
-    if [ "${BUILD_SYSTEM}" == "Debian" ]; then
-        # true hack ! -- nohar
-        chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
-    fi
-
-    # Configure GDM autologin
-    chroot /root sed -i \
-        -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
-        -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
-        -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
-        -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
-        -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
-        ${GDMCONF}
+	exit 0
 fi
 
-if [ -f /root/etc/kde3/kdm/kdmrc ]; then
-    # Configure KDM autologin
-    sed -i -r \
-        -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-        -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
-        -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
-        /root/etc/kde3/kdm/kdmrc
+# chroot needed to handle symlinks correctly
+if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
+then
+	GDMCONF=/etc/gdm/gdm-cdd.conf
+else
+	GDMCONF=/etc/gdm/gdm.conf
 fi
 
+# chroot needed to handle symlinks correctly
+if chroot /root [ -f ${GDMCONF} ]
+then
+	# true hack ! -- nohar
+	chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
+
+	# Configure GDM autologin
+	chroot /root \
+	sed -i -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
+	       -e "s/^AutomaticLogin=.*\$/AutomaticLogin=${USERNAME}/" \
+	       -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
+	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
+	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
+	${GDMCONF}
 fi
 
-if chroot /root /usr/bin/which kpersonalizer >/dev/null; then
-    # Disable first-login wizard for KDE
-    if [ ! -f /root/etc/kde3/kpersonalizerrc ]; then
-        cat > /root/etc/kde3/kpersonalizerrc <<EOF
-[General]
-FirstLogin=false
-EOF
-    else
-        echo "I'm not smart enough to disable kpersonalizer startup" >&2
-        echo "Because kpersonalizerrc already exists" >&2
-    fi
+if [ -f /root/etc/kde3/kdm/kdmrc ]
+then
+	# Configure KDM autologin
+	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
+		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=${USERNAME}/" \
+		  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
+	/root/etc/kde3/kdm/kdmrc
 fi
 
 log_end_msg