X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F25configure_init;h=84fa7410836f59f479e73b011157e6da0cb2f928;hb=8a4793dbe68ec2e28f0dbcc123f13339f57fac2b;hp=12e6315950ae0c96b908afe40ddc56c9c525f9f2;hpb=a7e62470dcdcd93501d9f54a96ca45d267ad1fe5;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index 12e6315..84fa741 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -23,14 +23,49 @@ 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
+        # AUTOMATIC SERIAL CONSOLE #
+        defconsole=$(sed -e 's%.*console=%console=%' /proc/cmdline)
+        if echo "${defconsole}" | grep -qs console=ttyS; then
+            PORT=$(echo "${defconsole}" | \
+                sed -e's%^console=%%' -e's%,.*%%')
+            SPEED=$(echo "${defconsole}" | \
+                    sed -e 's%^console=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
+    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
-for f in /root/etc/rc?.d/S??anacron; do
-    mv ${f} ${f%/*}/K00anacron
-done
+if [ -x /root/etc/init.d/anacron ]; then
+    for f in /root/etc/rc?.d/S??anacron; do
+        mv ${f} ${f%/*}/K00anacron
+    done
+fi
 
 # No point, really
 rm -f /root/etc/rc?.d/[SK]??postfix
@@ -40,15 +75,8 @@ 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.
-chmod -x /root/sbin/readahead-list
-
-# Install shutdown script
-cp -a /lib/casper/shutdown /root/etc/init.d/casper-shutdown
-if [ -f /root/etc/rc0.d/S90halt ]; then
-    ln -s ../init.d/casper-shutdown /root/etc/rc0.d/S89casper
-fi
-if [ -f /root/etc/rc6.d/S90reboot ]; then
-    ln -s ../init.d/casper-shutdown /root/etc/rc6.d/S89casper
+if [ -e /root/sbin/readahead-list ]; then
+    chmod -x /root/sbin/readahead-list
 fi
 
 log_end_msg