Merge lp:~clint-fewbar/ubuntu/oneiric/upstart/add-plymouth-messages into lp:ubuntu/oneiric/upstart

[Clint Byrum]

This attempts to make it as clear as possible to users what is blocking the system boot when they have interfaces defined in /etc/network/interfaces that cannot be brought up.

[Steve Langasek (vorlon)]

+ $PLYMOUTH pause-progress || :

Why does the progress need to be paused? This probably makes no difference with the standard Ubuntu plymouth theme, since we simply cycle the dots on the screen, but for themes that do care about progress bars I'm not sure pausing is the right thing. Have you tried it without this change?

+ $PLYMOUTH message --text="Waiting for network configuration..." || :
+ sleep 40
+ $PLYMOUTH message --text="Waiting up to 60 more seconds for network configuration..." || :
+ sleep 59

What's the value in having two different messages here instead of just one? Is this to keep the user from thinking the machine has hung? (If so, see above about not pausing progress...?)

+ continue_boot () {
+ $PLYMOUTH unpause-progress || :
+ }

Does this work in practice, or does upstart kill the job with too much force?

Also, I think this leaves the last message on the screen - do we want to clear it instead?

+ sleep 1

Not sure what this buys us - is this to try to ensure there's time to see the message before plymouth exits?

[Clint Byrum (clint-fewbar)]

Re pause/unpause, I hadn't thought about it much, but I suppose it makes sense that its still "Making progress".

I feel like this is a situation that we're hoping nobody runs into who didn't hack on their system in a weird way. So its best to inform the user of whats going on so they don't get a frustrating experience. Another option would be to watch for a keystroke and let the user skip the wait.. but that seems more complicated than just updating the message a few times while we wait.

The EXIT trap works fine as long as the plymouth command finishes within 5 seconds, but I think I'll take out the pause/unpause anyway, as I have no good reason to do that.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-04 16:30:25 +0000
+++ debian/changelog	2011-09-13 23:21:24 +0000
@@ -1,3 +1,11 @@
+upstart (1.3-0ubuntu8) UNRELEASED; urgency=low
+
+  * debian/conf/failsafe.conf: Add plymouth messages to help users
+    understand why the system boot takes longer when they have
+    static network interfaces defined. (LP: #847782)
+
+ -- Clint Byrum <[e-mail]>  Tue, 13 Sep 2011 16:12:01 -0700
+
 upstart (1.3-0ubuntu7) oneiric; urgency=low
 
   * debian/conf/failsafe.conf: raise timeout to 120 seconds to
 
=== modified file 'debian/conf/failsafe.conf'
--- debian/conf/failsafe.conf	2011-09-04 16:30:25 +0000
+++ debian/conf/failsafe.conf	2011-09-13 23:21:24 +0000
@@ -6,4 +6,31 @@
 start on filesystem and net-device-up IFACE=lo
 stop on runlevel
 
-pre-start exec sleep 120
+console output
+
+pre-start script
+	# Determine if plymouth is available
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping ; then
+		PLYMOUTH=/bin/plymouth
+	else
+		PLYMOUTH=":"
+	fi
+
+	continue_boot () {
+		$PLYMOUTH unpause-progress || :
+	}
+
+	trap continue_boot EXIT
+
+	sleep 20
+
+	$PLYMOUTH pause-progress || :
+	$PLYMOUTH message --text="Waiting for network configuration..." || :
+	sleep 40
+	$PLYMOUTH message --text="Waiting up to 60 more seconds for network configuration..." || :
+	sleep 59
+	$PLYMOUTH message --text="Booting system without full network configuration..." || :
+	sleep 1
+end script
+
+post-start exec	logger -t 'failsafe' -p daemon.warning "Failsafe of 120 seconds reached." || :