summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Amadori <marco.amadori@gmail.com>2008-07-12 11:13:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:00 +0100
commitc9f0399f0fd5da9042a4190763e4ecef653af8ce (patch)
tree74aa8f25f1485e06e19c4efea7020d95c6157a6f
parentf9cd00dc0b8146d1f71777f33dcfac0efdd84121 (diff)
downloadlive-boot-c9f0399f0fd5da9042a4190763e4ecef653af8ce.tar.gz
live-boot-c9f0399f0fd5da9042a4190763e4ecef653af8ce.zip
udevtrigger replacement.
* New udev (>= 1.24-1) replaced some binaries (here udevtrigger) with udevadm command line options, e.g. "udevtrigger" -> "udevadm trigger".
-rwxr-xr-xhooks/live2
-rwxr-xr-xscripts/live4
-rwxr-xr-xscripts/live-bottom/23networking2
3 files changed, 4 insertions, 4 deletions
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" ]