diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | hooks/live | 11 | ||||
| -rwxr-xr-x | scripts/live | 24 | ||||
| -rwxr-xr-x | scripts/live-bottom/23networking | 12 |
4 files changed, 40 insertions, 9 deletions
diff --git a/debian/control b/debian/control index dd22830..2042c92 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ XS-Upstream-Depends: git-core Package: live-initramfs Architecture: all -Depends: ${misc:Depends}, busybox, file, initramfs-tools, sudo, udev (>= 0.124), user-setup +Depends: ${misc:Depends}, busybox, file, initramfs-tools, sudo, udev, user-setup Recommends: eject, loop-aes-utils, uuid-runtime, wget Suggests: curlftpfs, genext2fs (>= 1.4.1), httpfs2, squashfs-tools, mtd-tools Description: Debian Live initramfs hook @@ -126,8 +126,15 @@ fi copy_exec /usr/bin/md5sum /bin # Program: udev -copy_exec /sbin/udevadm /sbin -copy_exec /sbin/udevsettle /sbin +if [ -x /sbin/udevadm ] +then + # lenny + copy_exec /sbin/udevadm /sbin +else + # etch + copy_exec /sbin/udevtrigger /sbin + copy_exec /sbin/udevsettle /sbin +fi copy_exec /usr/bin/udevinfo /bin # Program: wget diff --git a/scripts/live b/scripts/live index f4a4029..15710c2 100755 --- a/scripts/live +++ b/scripts/live @@ -650,8 +650,16 @@ do_netmount () 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 @@ -1041,8 +1049,16 @@ setup_unionfs () 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. diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 429a135..5e9afe9 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -46,8 +46,16 @@ iface lo inet loopback EOF -udevadm trigger -udevsettle +if [ -x /sbin/udevadm ] +then + # lenny + udevadm trigger + udevadm settle +else + # etch + udevtrigger + udevsettle +fi if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ] then |