diff -Nru fai-3.4.8ubuntu1/bin/fai fai-3.4.8ubuntu2/bin/fai
--- fai-3.4.8ubuntu1/bin/fai	2011-05-10 10:35:42.000000000 +0000
+++ fai-3.4.8ubuntu2/bin/fai	2012-03-20 09:50:43.000000000 +0000
@@ -94,7 +94,13 @@
 	eval_cmdline
 	[ -d /sys/kernel ] || mount -t sysfs sysfs /sys
 	# we really need to start udev
-	[ -x /etc/init.d/udev ] && [ X$UPSTART_JOB != Xfai ] && /etc/init.d/udev start
+	if [ -x /etc/init.d/udev ]; then
+	    if [ X$UPSTART_JOB != Xfai ]; then
+		/etc/init.d/udev start
+	    else
+		test -f /etc/init/udevtrigger.conf && start udevtrigger
+	    fi
+        fi
 	mkdir -p /var/run/network /dev/shm/network # when using initrd kernels
 	ifup lo
 	[ -x /sbin/portmap ] && /sbin/portmap
diff -Nru fai-3.4.8ubuntu1/debian/changelog fai-3.4.8ubuntu2/debian/changelog
--- fai-3.4.8ubuntu1/debian/changelog	2012-01-31 12:42:58.000000000 +0000
+++ fai-3.4.8ubuntu2/debian/changelog	2012-03-20 10:03:34.000000000 +0000
@@ -1,3 +1,14 @@
+fai (3.4.8ubuntu2) precise; urgency=low
+
+  * In the case FAI is started in an Upstart environment, check if an
+    upstart job udevtrigger exists. If it does, we really need to start
+    this job so that "missed" kernel events are replayed. Otherwise may
+    miss block events. This results in block devices having "wrong" owners
+    and confuses the FAI "disk-info" utility, which in turn breaks the
+    disk detection completely. LP: #941959
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 20 Mar 2012 10:46:12 +0100
+
 fai (3.4.8ubuntu1) precise; urgency=low
 
   * New Upstream Version