[SCM] debian-live branch, master, updated. debian/1.136.3-1-12-gd0f1544

[Daniel Baumann]

The following commit has been merged in the master branch:
commit a7e3de02c60a41d5adbf4b7dd688a159160d6e24
Author: Steven Shiau <steven at nchc.org.tw>
Date:   Fri Aug 8 16:07:11 2008 +0200

    Another fix about using udevsettle or "udevadm settle".

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 619cbb4..fdf7b38 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -190,7 +190,15 @@ setup_loop ()
 	local readonly=${6}
 
 	modprobe -q -b "${module}"
-	udevsettle
+
+	if [ -x /sbin/udevadm ]
+	then
+		# lenny
+		udevadm settle
+	else
+		# etch
+		udevsettle
+	fi
 
 	for loopdev in ${pattern}
 	do

-- 
debian-live