[SCM] debian-live branch, master, updated. 1.130.1-3-41-g5f9e8b8

[Marco Amadori]

The following commit has been merged in the master branch:
commit 5f9e8b86d7c769b8cc648d148ba1014ce5fec95e
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Sat Jul 12 11:13:09 2008 +0200

    udevtrigger replacement.
    
    * New udev (>= 1.24-1) replaced some binaries (here udevtrigger) with
      udevadm command line options, e.g. "udevtrigger" -> "udevadm trigger".
    
    Signed-off-by: Marco Amadori <marco.amadori at gmail.com>

diff --git a/hooks/live b/hooks/live
index 56425ad..48802fc 100755
--- a/hooks/live
+++ b/hooks/live
@@ -126,7 +126,7 @@ fi
 copy_exec /usr/bin/md5sum /bin
 
 # Program: udev
-copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevadm /sbin
 copy_exec /sbin/udevsettle /sbin
 copy_exec /usr/bin/udevinfo /bin
 
diff --git a/scripts/live b/scripts/live
index e211263..b886f47 100755
--- a/scripts/live
+++ b/scripts/live
@@ -650,7 +650,7 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	udevtrigger
+	udevadm trigger
 	udevsettle
 
 	ipconfig ${DEVICE} | tee /netboot.config
@@ -1041,7 +1041,7 @@ setup_unionfs ()
 			modprobe -q -b ${module}
 		done
 
-		udevtrigger
+		udevadm trigger
 		udevsettle
 
 		# For some reason, udevsettle does not block in this scenario,
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 6c726c6..429a135 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,7 +46,7 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
+udevadm trigger
 udevsettle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]

-- 
debian-live