X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=96ab63a044df0261739a8080648a0d3ee21003c2;hb=088e23d8225c53f92bc12125d95a11e165869a9a;hp=f79eaff2237d8415ec5d49cc7d6d9075518e0a44;hpb=1094f4ffce8c2d53c7200184ed42dc1bb15c867e;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index f79eaff..96ab63a 100755 --- a/scripts/live +++ b/scripts/live @@ -762,16 +762,8 @@ do_netmount () modprobe -q af_packet # For DHCP - if [ -x /sbin/udevadm ] - then - # lenny - udevadm trigger - udevadm settle - else - # etch - udevtrigger - udevsettle - fi + udevadm trigger + udevadm settle ipconfig ${DEVICE} | tee /netboot.config @@ -1232,16 +1224,8 @@ setup_unionfs () modprobe -q -b ${module} done - if [ -x /sbin/udevadm ] - then - # lenny - udevadm trigger - udevadm settle - else - # etch - udevtrigger - udevsettle - fi + udevadm trigger + udevadm settle # For some reason, udevsettle does not block in this scenario, # so we sleep for a little while.