Merge lp:~gandelman-a/ubuntu/oneiric/udev/lp818177 into lp:ubuntu/oneiric/udev

[Adam Gandelman]

This seems to fix Bug #818177 as well as other possibly related race conditions after init-bottom.

[Steve Langasek (vorlon)]

This is not a fix for the race conditions. It reduces the race window, but the fact that there's a race at all means that there's a more fundamental problem here. 'udevadm settle' only guarantees that currently-in-process events will be fully handled before it returns, but calling 'udevadm control --exit' should *already* provide this guarantee - and if it doesn't, all you've done is move the race, because when we do call 'udevadm control --exit' a few milliseconds later, any new events that are in process at *that* point will suffer from the same race.

We need to understand why 'udevadm control --exit' isn't sufficient and fix that at its source, because 'udevadm settle' doesn't give us the guarantees we need.

review: Disapprove

Unmerged revisions

207. By Adam Gandelman on 2011-09-01

debian/udev.initramfs-bottom: Allow udev settle before stopping it
(LP: #818177)

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-23 06:58:23 +0000
+++ debian/changelog	2011-09-01 19:24:25 +0000
@@ -1,3 +1,10 @@
+udev (173-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/udev.initramfs-bottom: Allow udev settle before stopping it
+    (LP: #818177)
+
+ -- Adam Gandelman <[e-mail]>  Thu, 01 Sep 2011 12:03:18 -0700
+
 udev (173-0ubuntu3) oneiric; urgency=low
 
   * Include input_id in the initramfs to prevent errors when enumerating

=== modified file 'debian/udev.initramfs-bottom'
--- debian/udev.initramfs-bottom	2011-06-28 17:50:21 +0000
+++ debian/udev.initramfs-bottom	2011-09-01 19:24:25 +0000
@@ -16,6 +16,10 @@
 	;;
 esac
 
+. /scripts/functions
+
+# Let udev settle before stopping it. (LP #818177)
+wait_for_udev 10
 
 # Stop udevd, we'll miss a few events while we run init, but we catch up
 udevadm control --exit