projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replacing previous imperfect changes for udevadm with check for udevadm and using...
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
f4a4029
..
15710c2
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-650,8
+650,16
@@
do_netmount ()
modprobe -q af_packet # For DHCP
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
ipconfig ${DEVICE} | tee /netboot.config
@@
-1041,8
+1049,16
@@
setup_unionfs ()
modprobe -q -b ${module}
done
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.
# For some reason, udevsettle does not block in this scenario,
# so we sleep for a little while.