diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-30 18:49:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | f46f34335c75248f8625232e72fb0635702bd6cc (patch) | |
| tree | 16e0af38c1e50b499eb07e43ecdca91526cd0b54 | |
| parent | 2590556a825d10f48ca3d4443b41156bb019c9af (diff) | |
| download | live-boot-f46f34335c75248f8625232e72fb0635702bd6cc.tar.gz live-boot-f46f34335c75248f8625232e72fb0635702bd6cc.zip | |
Merging casper 1.197.
| -rw-r--r-- | docs/ChangeLog.casper | 11 | ||||
| -rwxr-xr-x | scripts/live-bottom/22serialtty | 2 | ||||
| -rwxr-xr-x | scripts/live-bottom/25configure_init | 3 |
3 files changed, 13 insertions, 3 deletions
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@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 |