diff options
Diffstat (limited to 'core/rootfs/rootfs-stage31/data/inc/setup_network_retry')
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/setup_network_retry | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry index c1fff39d..449c0d8f 100644 --- a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry +++ b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry @@ -17,11 +17,11 @@ for i in 1 2 3 4 5 6 7 8; do wait_for_iface "$IFACE" "$(( 15 + i * 2 ))" retval=$? ip link set dev "$BRIDGE" up - if [ "$retval" -eq 0 ] && [ "$i" -ge 4 ] && [ -n "$CLIENTIP" ] && [ -n "$GATEWAY" ]; then + if [ "$retval" -eq 0 ] && [ "$i" -ge 4 ] && [ -n "$ip" ] && [ -n "$router" ]; then echo "....." usleep 100000 echo "Checking if static IP config works...." - if ping -c1 -w2 "$GATEWAY" &> /dev/null || ping -c1 -w2 "$SERVERIP" &> /dev/null; then + if ping -c1 -w2 "$router" &> /dev/null || ping -c1 -w2 "${SLX_KCL_SERVERS%% *}" &> /dev/null; then echo "apparently so." echo "Trying to boot without DHCP config (DNS, Hostname, ...), YMMV!" sleep 3 @@ -33,8 +33,8 @@ for i in 1 2 3 4 5 6 7 8; do wait_for_iface "$BRIDGE" 10 usleep 100000 - udhcpc $PARAM -O hostname -O ntpsrv -O domain -O search -t "$(( 2 + i / 2 ))" -T "$(( 4 + i ))" -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" \ - || udhcpc $PARAM -O hostname -O ntpsrv -O domain -O search -t "$(( 2 + i / 2 ))" -T "$(( 4 + i ))" -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" + udhcpc $PARAM -O hostname -O ntpsrv -O domain -O search -O dns -t "$(( 2 + i / 2 ))" -T "$(( 4 + i ))" -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" \ + || udhcpc $PARAM -O hostname -O ntpsrv -O domain -O search -O dns -t "$(( 2 + i / 2 ))" -T "$(( 4 + i ))" -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" RET="$?" if [ "$RET" -eq 0 ]; then |