[SCM] live-initramfs branch, debian-next, updated. debian/1.177.2-1-22-g5d03a45
Daniel Baumann
daniel at debian.org
Fri Apr 30 16:55:20 UTC 2010
The following commit has been merged in the debian-next branch:
commit 5d03a4557078fc416060769c68b27686af2246f2
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 30 18:49:38 2010 +0200
Merging casper 1.197.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 82b667b..246d4b7 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,14 @@
+casper (1.197) karmic; urgency=low
+
+ [ Colin Watson ]
+ * Fix tty device name construction to work with new upstart (LP: #438678).
+
+ [ Loïc Minier ]
+ * scripts/casper-bottom/22serialtty: pass -L to getty and set term to vt100.
+ * scripts/casper-bottom/22serialtty: set +x...
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 01 Oct 2009 23:27:45 +0100
+
casper (1.196) karmic; urgency=low
* Extend our hack that arranges to run setupcon after usplash exits to
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
--
live-initramfs
More information about the debian-live-changes
mailing list