Author: glen Date: Thu Oct 28 18:41:01 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- pass --noclear if tty1
---- Files affected:
packages/upstart:
start-ttys.conf (1.3 -> 1.4) , tty.conf (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/upstart/start-ttys.conf
diff -u packages/upstart/start-ttys.conf:1.3
packages/upstart/start-ttys.conf:1.4
--- packages/upstart/start-ttys.conf:1.3 Mon May 10 18:31:15 2010
+++ packages/upstart/start-ttys.conf Thu Oct 28 20:40:56 2010
@@ -10,8 +10,15 @@
if [ -f /etc/sysconfig/upstart ]; then
. /etc/sysconfig/upstart
fi
- for tty in $(echo $ACTIVE_CONSOLES) ; do
+ for tty in $(echo $ACTIVE_CONSOLES); do
[ "$RUNLEVEL" = "5" -a "$tty" = "$X_TTY" ] && continue
- initctl start tty TTY=${tty#/dev/}
+ TTY=${tty#/dev/}
+ # do not clear on tty1
+ if [ "${TTY#tty}" = "1" ]; then
+ ARGS=--noclear
+ else
+ ARGS=
+ fi
+ initctl start tty TTY=$TTY ARGS=$ARGS || :
done
end script
================================================================
Index: packages/upstart/tty.conf
diff -u packages/upstart/tty.conf:1.1 packages/upstart/tty.conf:1.2
--- packages/upstart/tty.conf:1.1 Tue Apr 20 20:11:05 2010
+++ packages/upstart/tty.conf Thu Oct 28 20:40:56 2010
@@ -6,4 +6,4 @@
respawn
instance $TTY
-exec /sbin/mingetty $TTY
+exec /sbin/mingetty $TTY $ARGS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/start-ttys.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/tty.conf?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
