diff -Nru friendly-recovery-0.2.18ubuntu1/debian/changelog friendly-recovery-0.2.19/debian/changelog --- friendly-recovery-0.2.18ubuntu1/debian/changelog 2012-01-17 17:17:56.000000000 +0000 +++ friendly-recovery-0.2.19/debian/changelog 2012-01-25 18:28:24.000000000 +0000 @@ -1,3 +1,15 @@ +friendly-recovery (0.2.19) precise; urgency=low + + * Update upstart job + - Drop all the || null in pre-start and replace by a final exit 0 + - Start setvtrgb from pre-start + - Emit mounted MOUNTPOINT=/run from pre-start (to start resolvconf) + - Start udev from pre-start + - Manually call udevadm trigger/settle from pre-start (upstart job hangs) + - Turn off kernel output before showing the menu to avoid screen corruption + + -- Stéphane Graber Wed, 25 Jan 2012 13:24:03 -0500 + friendly-recovery (0.2.18ubuntu1) precise; urgency=low * debian/friendly-recovery.upstart: Add missing emits stanzas diff -Nru friendly-recovery-0.2.18ubuntu1/debian/friendly-recovery.upstart friendly-recovery-0.2.19/debian/friendly-recovery.upstart --- friendly-recovery-0.2.18ubuntu1/debian/friendly-recovery.upstart 2012-01-17 17:17:56.000000000 +0000 +++ friendly-recovery-0.2.19/debian/friendly-recovery.upstart 2012-01-25 18:23:54.000000000 +0000 @@ -7,6 +7,7 @@ emits recovery emits startup +emits mounted pre-start script if plymouth --ping; then @@ -14,11 +15,22 @@ fi # Try to set the hostname and initialize the console - # use --no-wait to avoid hanging here. The menu itself doesn't - # depend on any of these two so it's fine to have them start - # in the background - start -n hostname || true - start -n console-setup || true + start hostname + start console-setup + start setvtrgb + + # Emit the mounted event to trigger resolvconf and mounted-run + initctl emit mounted MOUNTPOINT=/run + + # Finally start udev + start udev + udevadm trigger --action=add + udevadm settle + + # And turn off kernel messages (to avoid corrupting the menu) + dmesg --console-off + + exit 0 end script script