X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=d73f63bee5eb9dea63c4fdcd807f6217cd1ee6d1;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=72aaf12e257505470e6e07acdc48c89785984eca;hpb=1d8d4b19c18659024fbabee3d2626c0e79d1453f;p=live-boot-grml.git diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 72aaf12..d73f63b 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -18,7 +18,7 @@ case "${1}" in ;; esac -# live-initramfs header +# live-boot header if [ -n "${NONETWORKING}" ] then @@ -29,7 +29,7 @@ fi log_begin_msg "Preconfiguring networking" -# live-initramfs script +# live-boot script IFFILE="/root/etc/network/interfaces" @@ -46,16 +46,8 @@ iface lo inet loopback EOF -if [ -x /sbin/udevadm ] -then - # lenny - udevadm trigger - udevadm settle -else - # etch - udevtrigger - udevsettle -fi +udevadm trigger +udevadm settle if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ] then @@ -127,7 +119,7 @@ EOF cat > /root/etc/resolv.conf << EOF # /etc/resolv.conf -# Autogenerated by live-initramfs +# Autogenerated by live-boot search ${rc_search} domain ${rc_search} ${rc_server0}