diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-15 07:30:07 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:07 +0100 |
| commit | 85e2939c446d0ead490be57d0a0edac9f6a3f772 (patch) | |
| tree | 559d90f9ab23cefc675e954c73223f67d0f8da99 /scripts/live | |
| parent | cdb6f35675b4d9ba566f1f2305c250f5c96b7753 (diff) | |
| download | live-boot-85e2939c446d0ead490be57d0a0edac9f6a3f772.tar.gz live-boot-85e2939c446d0ead490be57d0a0edac9f6a3f772.zip | |
Removing etch compatibility.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 24 |
1 files changed, 4 insertions, 20 deletions
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. |