From 058dcef0d8013a45c5f289f91d08b036860aea94 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 15 Jul 2008 23:42:33 +0200
Subject: Replacing previous imperfect changes for udevadm with check for
 udevadm and using old commands when beeing on etch. Also handling udevtrigger
 with udevadm if available.

---
 scripts/live                     | 24 ++++++++++++++++++++----
 scripts/live-bottom/23networking | 12 ++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/live b/scripts/live
index f4a4029..15710c2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -650,8 +650,16 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	udevadm trigger
-	udevsettle
+	if [ -x /sbin/udevadm ]
+	then
+		# lenny
+		udevadm trigger
+		udevadm settle
+	else
+		# etch
+		udevtrigger
+		udevsettle
+	fi
 
 	ipconfig ${DEVICE} | tee /netboot.config
 
@@ -1041,8 +1049,16 @@ setup_unionfs ()
 			modprobe -q -b ${module}
 		done
 
-		udevadm trigger
-		udevsettle
+		if [ -x /sbin/udevadm ]
+		then
+			# lenny
+			udevadm trigger
+			udevadm settle
+		else
+			# etch
+			udevtrigger
+			udevsettle
+		fi
 
 		# For some reason, udevsettle does not block in this scenario,
 		# so we sleep for a little while.
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 429a135..5e9afe9 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,8 +46,16 @@ iface lo inet loopback
 
 EOF
 
-udevadm trigger
-udevsettle
+if [ -x /sbin/udevadm ]
+then
+	# lenny
+	udevadm trigger
+	udevadm settle
+else
+	# etch
+	udevtrigger
+	udevsettle
+fi
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
-- 
cgit v1.2.3