From c9d58cf19e1e40db8ee3f529fdcd6a319b156257 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 20:41:55 +0200
Subject: [PATCH] Adding upstream version 1.136.2.

---
 hooks/live                       | 24 ++++++++++++++----------
 scripts/live                     | 24 ++++++++++++++++++++----
 scripts/live-bottom/23networking | 12 ++++++++++--
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/hooks/live b/hooks/live
index 4c72f0b..190fac5 100755
--- a/hooks/live
+++ b/hooks/live
@@ -126,8 +126,15 @@ fi
 copy_exec /usr/bin/md5sum /bin
 
 # Program: udev
-copy_exec /sbin/udevadm /sbin
-copy_exec /sbin/udevsettle /sbin
+if [ -x /sbin/udevadm ]
+then
+	# lenny
+	copy_exec /sbin/udevadm /sbin
+else
+	# etch
+	copy_exec /sbin/udevtrigger /sbin
+	copy_exec /sbin/udevsettle /sbin
+fi
 copy_exec /usr/bin/udevinfo /bin
 
 # Program: wget
@@ -139,15 +146,13 @@ fi
 # FUSE kernel module
 manual_add_modules fuse
 
-# FUSE filesystem: httpfs
-if [ -x /usr/bin/httpfs_ssl ]
+# FUSE filesystem: httpfs2
+if [ -x /usr/bin/httpfs2_ssl ]
 then
 	copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
-else
-	if [ -x /usr/bin/httpfs ]
-	then
-		copy_exec /usr/bin/httpfs2 /bin/httpfs
-	fi
+elif [ -x /usr/bin/httpfs2 ]
+then
+	copy_exec /usr/bin/httpfs2 /bin/httpfs
 fi
 
 # FUSE filesystem: curlftpfs
@@ -155,4 +160,3 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
-
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
-- 
2.1.4