From f46f34335c75248f8625232e72fb0635702bd6cc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Apr 2010 18:49:38 +0200
Subject: Merging casper 1.197.

---
 scripts/live-bottom/22serialtty      | 2 +-
 scripts/live-bottom/25configure_init | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/live-bottom/22serialtty b/scripts/live-bottom/22serialtty
index 23ca8f0..a8008eb 100755
--- a/scripts/live-bottom/22serialtty
+++ b/scripts/live-bottom/22serialtty
@@ -43,7 +43,7 @@ start on stopped rc RUNLEVEL=[2345]
 stop on runlevel [!2345]
 
 respawn
-exec /sbin/getty 115200 ${tty}
+exec /sbin/getty -L 115200 ${tty} vt100
 EOF
 
 			log_end_msg
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index b90a7db..67e21a6 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -77,8 +77,7 @@ then
 		then
 			for f in /root/etc/init/tty*
 			do
-				sed -i -e "/^respawn$/!s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
-				sed -i -e "s|^exec.*|exec /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
+				sed -i -e "s|^exec.*|exec /bin/login -f $USERNAME </dev/$(basename $f .conf) > /dev/$(basename $f .conf) 2>\&1|" $f
 			done
 		fi
 	fi
-- 
cgit v1.2.3