X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F25configure_init;h=d007556d36af89a4a3625c6769a38e563e222bd5;hb=86cb1930ec63c3554154d4f9eec36ad3d508ec7c;hp=1152b4bad938ed7d1494dcd93ff85934abde75d2;hpb=7c815f70054a82bfccf992d9b20d4d56b60f46cc;p=live-boot-grml.git

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index 1152b4b..d007556 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -66,8 +66,23 @@ if [ -n "$USERNAME" ]; then
             for f in /root/etc/event.d/tty*; do
                 sed -i -e "s|^respawn.*|respawn /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
             done
+
+	    if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
+	    	for x in $(cat /proc/cmdline); do
+		    case $x in
+			noninteractive)
+			    sed -i -e "s|^exec.*|exec /usr/bin/ubiquity noninteractive </dev/tty1 > /dev/tty1 2>\&1|" /root/etc/event.d/tty1
+			    rm -f /root/etc/rc?.d/[SK]??gdm
+			    rm -f /root/etc/rc?.d/[SK]??kdm
+			;;
+		    esac
+		done
+	    fi
         fi
      fi
+
+    # Since we use autologin, lastlog doesn't make sense on the console.
+    sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
 fi
 
 fi