From 5374316c989e17cf9aac2b22034dd15c94682c1e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 3 Sep 2019 11:15:14 +0200
Subject: [rootfs-stage31] Clean up network config, increase delay on retry

---
 core/rootfs/rootfs-stage31/data/inc/setup_network_retry | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'core/rootfs/rootfs-stage31/data/inc/setup_network_retry')

diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry
index 5ac28a57..f2a53783 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_network_retry
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_network_retry
@@ -1,23 +1,22 @@
 #!/bin/ash
 
-source /inc/network.functions
 source /run/network.conf
 
 for i in 1 2 3 4 5 6 7 8; do
 	echo "<$i> Try to fix broken network"
 	echo -n "Take interface $IFACE down .. "
 
-	ip link set dev $IFACE down
+	ip link set dev "$IFACE" down
 	usleep 10000
 
 	echo "and up again.."
-	ip link set dev $IFACE up
-	ip link set dev $BRIDGE up
+	ip link set dev "$IFACE" up
+	ip link set dev "$BRIDGE" up
 	usleep 100000
 
-	wait_for_iface "$IFACE"
+	wait_for_iface "$IFACE" 20
 
-	udhcpc $PARAM -O domain -O nissrv -O nisdomain -O wpad -O search -t 5 -T 2 -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE"
+	udhcpc $PARAM -O ntpsrv -O domain -O search -t 6 -T 4 -A 5 -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE"
 
 	if [ $? -eq 0 ]; then
 		echo "Finally fixed IP config. Continue boot."
-- 
cgit v1.2.3-55-g7522