diff options
| author | Sebastian | 2014-01-30 22:23:12 +0100 |
|---|---|---|
| committer | Sebastian | 2014-01-30 22:23:12 +0100 |
| commit | 129c35d5982d78769b4540c5b9db4c34ecd3133a (patch) | |
| tree | e00e1fa0c3f889582af13c9b84d28fbf23306896 /remote | |
| parent | fix bug in default session exec (diff) | |
| download | tm-scripts-129c35d5982d78769b4540c5b9db4c34ecd3133a.tar.gz tm-scripts-129c35d5982d78769b4540c5b9db4c34ecd3133a.tar.xz tm-scripts-129c35d5982d78769b4540c5b9db4c34ecd3133a.zip | |
[rfs-s31] make sure IFACE in /run/network.conf is not empty :)
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/inc/setup_network | 10 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/inc/setup_network_retry | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_network b/remote/rootfs/rootfs-stage31/data/inc/setup_network index 44d05ddf..e21e18a9 100755 --- a/remote/rootfs/rootfs-stage31/data/inc/setup_network +++ b/remote/rootfs/rootfs-stage31/data/inc/setup_network @@ -38,7 +38,10 @@ for LINE in $IP_OUT; do ip link set dev "$IFACE" up wait_for_iface "$IFACE" brctl addif "$BRIDGE" "$IFACE" || drop_shell "Could not add $IFACE to $BRIDGE" - + + # save our variables for retry on fail + echo "IFACE=$IFACE" > /run/network.conf + # analyze ip information from the kernel command line and put parts # of it into several variables if [ -n "$IPINFO" ] ; then @@ -79,10 +82,9 @@ fi echo -n "$CLIENTIP" > "/run/firstip" echo -n "$GATEWAY" > "/run/firstgw" -# save variables for retry script -echo "CLIENTIP=$CLIENTIP" > /run/network.conf +# save our variables for retry on fail ff. +echo "CLIENTIP=$CLIENTIP" >> /run/network.conf echo "GATEWAY=$GATEWAY" >> /run/network.conf -echo "IFACE=$IFACE" >> /run/network.conf echo "BRIDGE=$BRIDGE" >> /run/network.conf udhcpc $PARAM -O domain -O nissrv -O nisdomain -O wpad -t 5 -T 2 -s "/inc/udhcpc-trigger" -f -n -q -i "$BRIDGE" diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_network_retry b/remote/rootfs/rootfs-stage31/data/inc/setup_network_retry index 9693fbf5..b84fb3c5 100755 --- a/remote/rootfs/rootfs-stage31/data/inc/setup_network_retry +++ b/remote/rootfs/rootfs-stage31/data/inc/setup_network_retry @@ -5,7 +5,7 @@ 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 and up again.." + echo -n "Take interface $IFACE down .. " ip link set dev $IFACE down usleep 1000 |