X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F25configure_init;h=60baa76804ffa2be109d5d17baf166c5d6582c0c;hb=refs%2Ftags%2Fdebian%2F1.79%2Bdebian-1;hp=0c5c43e6074c2b7d28a3a0d6a66248cf3fa62bda;hpb=4a0b1ba4d428c623d14bae7f0db85c80abb0da0a;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index 0c5c43e..60baa76 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up init..."
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs()
 {
@@ -23,15 +23,50 @@ log_begin_msg "$DESCRIPTION"
 # Arrange for shells on virtual consoles, rather than login prompts
 
 if [ -n "$USERNAME" ]; then
-    sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+    if [ ! -z "${CASPERGETTY}" ]; then
+       if echo "${DEFCONSOLE}" | grep -qs ttyS; then
+            # AUTOMATIC SERIAL CONSOLE #
+            PORT=$(echo "${DEFCONSOLE}" | \
+                sed -e 's%,.*%%')
+            SPEED=$(echo "${DEFCONSOLE}" | \
+                    sed -e 's%ttyS[0-9]\+,%%' \
+                        -e's%\([0-9]\+\).*%\1%')
+            if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" ) ; then
+                IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9" 
+                for ID1 in $IDs; do
+                    for ID2 in $IDs; do
+                        ID="${ID1}${ID2}"
+                        if ! grep "^${ID}:" /etc/inittab ; then
+                            #make sure it is not already in use
+                            break 2
+                        fi
+                    done
+                done
+                echo "${ID}:2345:respawn:/sbin/casper-getty -L ${PORT} ${SPEED} vt100" \
+                >>/root/etc/inittab
+            fi
+        fi
+        if [ -f /root/etc/inittab ]; then
+             sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/casper-getty%' /root/etc/inittab
+        fi
+    else
+        if [ -f /root/etc/inittab ]; then
+            sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+	fi
+        if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]; 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
+        fi
+    fi
 fi
 
 # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
 # /etc/crontab remaining disabled, yet also not run by anacron
 if [ -x /root/etc/init.d/anacron ]; then
-	for f in /root/etc/rc?.d/S??anacron; do
-    	mv ${f} $(dirname ${f})/K00anacron
-	done
+    for f in /root/etc/rc?.d/S??anacron; do
+        mv ${f} ${f%/*}/K00anacron
+    done
 fi
 
 # No point, really
@@ -43,7 +78,7 @@ rm -f /root/etc/rc?.d/K??hwclock.sh
 # Disable readahead since it doesn't play well with squashfs + unionfs
 # use chmod instead of mv to not trigger unionfs bugs.
 if [ -e /root/sbin/readahead-list ]; then
-	chmod -x /root/sbin/readahead-list
+    chmod -x /root/sbin/readahead-list
 fi
 
 log_end_msg