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=573b2a6daeee02a2bd5f690b6e9c9b2b45c5d30a;hpb=4042b2eda2107dda511a29ae376d9724e0fd7a33;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index 573b2a6..60baa76 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -24,20 +24,19 @@ log_begin_msg "$DESCRIPTION"
 
 if [ -n "$USERNAME" ]; then
     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]\+,%%' \
+       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
+                        if ! grep "^${ID}:" /etc/inittab ; then
                             #make sure it is not already in use
                             break 2
                         fi
@@ -47,6 +46,9 @@ if [ -n "$USERNAME" ]; then
                 >>/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