Merge lp:~carifio/lightdm/lightdm-lp967229 into lp:ubuntu/precise/lightdm

[Mike Carifio]

[Mike Carifio (carifio)]

Modified /etc/init/lightdm.conf post-stop script to clear /dev/tty7 if lightdm exits successfully.

[Michael Terry (mterry)]

I dunno. I tested in a virtual machine and it felt like it made it worse. I saw the text very briefly, it cleared, then I saw it again very briefly, then plymouth came up. So it looked like the text flashed off and on again.

review: Needs Fixing

[Marc Deslauriers (mdeslaur)]

This approach doesn't really work. Not only is clearing the text likely to be visible, but other daemons which are in the process of shutting down will still be printing stuff to the screen before plymouth comes up.

review: Disapprove

Unmerged revisions

70. By Mike Carifio on 2012-10-25

Added debian/changelog entry.

69. By Mike Carifio on 2012-10-25

Clear /dev/tty7 on lightdm stop if and only if lightdm exits
without error. Mitigates LP: #967229.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-18 18:37:47 +0000
+++ debian/changelog	2012-10-25 20:24:21 +0000
@@ -1,3 +1,10 @@
+lightdm (1.2.1-0ubuntu2) precise-proposed; urgency=low
+
+  * Clear /dev/tty7 on lightdm stop if and only if lightdm exits
+    without error. Mitigates LP: #967229.
+
+ -- Mike Carifio <[e-mail]>  Thu, 25 Oct 2012 16:13:07 -0400
+
 lightdm (1.2.1-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release:

=== modified file 'debian/lightdm.upstart'
--- debian/lightdm.upstart	2011-11-02 11:37:43 +0000
+++ debian/lightdm.upstart	2012-10-25 20:24:21 +0000
@@ -48,6 +48,15 @@
 end script
 
 post-stop script
+
+    # If lightdm exits ok, clear messages on /dev/tty7
+    # Mitigates a race condition between lightdm stopping
+    # and plymouth starting (LP: #967229)
+	if [ -z "$EXIT_STATUS" -a -z "$EXIT_SIGNAL" ]; then
+        logger "$UPSTART_JOB cleared /dev/tty7"
+	    clear > /dev/tty7
+	fi
+
 	if [ "$UPSTART_STOP_EVENTS" = runlevel ]; then
 		initctl emit desktop-shutdown
 	fi