Adding live-initramfs 1.87.1-1.

1 files changed, 7 insertions, 35 deletions

diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index 60baa76..f9a8626 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -23,41 +23,13 @@ log_begin_msg "$DESCRIPTION"
 # Arrange for shells on virtual consoles, rather than login prompts
 
 if [ -n "$USERNAME" ]; then
-    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
+    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|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
+        done
     fi
 fi