diff options
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/network.functions | 4 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/setup_network | 2 | ||||
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/setup_network_retry | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/rootfs/rootfs-stage31/data/inc/network.functions b/core/rootfs/rootfs-stage31/data/inc/network.functions index 641f4f55..9ec3eafb 100644 --- a/core/rootfs/rootfs-stage31/data/inc/network.functions +++ b/core/rootfs/rootfs-stage31/data/inc/network.functions @@ -1,6 +1,6 @@ wait_for_iface() { local DEVICE=$1 - local TIMEOUT=10 + local TIMEOUT=20 echo -n "Waiting for interface $DEVICE: " # Some systems don't have operstate. Seems to be hardware dependent [ ! -e "/sys/class/net/${DEVICE}/operstate" ] && usleep 10000 @@ -8,7 +8,7 @@ wait_for_iface() { while true; do # check linkstate [ "x$(cat "/sys/class/net/${DEVICE}/operstate")" == "xup" ] && break - TIMEOUT=$(( $TIMEOUT - 1 )) # don't wait forever, the pcnet iface of vmware will never be "up" although it's working + TIMEOUT=$(( TIMEOUT - 1 )) # don't wait forever, the pcnet iface of vmware will never be "up" although it's working [ "$TIMEOUT" -le 0 ] && break # else echo -n "." diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network b/core/rootfs/rootfs-stage31/data/inc/setup_network index c3ab7473..6787027d 100644 --- a/core/rootfs/rootfs-stage31/data/inc/setup_network +++ b/core/rootfs/rootfs-stage31/data/inc/setup_network @@ -114,7 +114,7 @@ echo "GATEWAY=$GATEWAY" >> /run/network.conf echo "BRIDGE=$BRIDGE" >> /run/network.conf echo "UID=$UID" >> /run/network.conf -udhcpc $PARAM -x "0x3d:$UID" -O ntpsrv -O domain -O wpad -O search -t 5 -T 2 -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" +udhcpc $PARAM -x "0x3d:$UID" -O ntpsrv -O domain -O wpad -O search -t 4 -T 3 -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" URET=$? # udhcpc return value will be return value of this script [ -z "$CLIENTIP" ] && CLIENTIP=$(cat /run/firstip) diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry index 95c662c7..5ac28a57 100644 --- a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry +++ b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry @@ -8,12 +8,12 @@ for i in 1 2 3 4 5 6 7 8; do echo -n "Take interface $IFACE down .. " ip link set dev $IFACE down - usleep 1000 + usleep 10000 echo "and up again.." ip link set dev $IFACE up ip link set dev $BRIDGE up - usleep 1000 + usleep 100000 wait_for_iface "$IFACE" @@ -31,4 +31,4 @@ done [ $RET -gt 0 ] && drop_shell "Something is really broken.. Please check your network cable and reset your computer." # create correct return value -[ $RET -eq 0 ] +[ $RET -eq 0 ] |