# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1506182208 -7200
# Node ID 121612c8980586ce58d0a110dbbc3d684bd8b6b1
# Parent  265e84f3feb6adc69fde296afb48dbd9bb490b61
busybox/udhcpc6: update script (again)

diff -r 265e84f3feb6 -r 121612c89805 busybox/stuff/udhcp.script
--- a/busybox/stuff/udhcp.script	Sat Sep 23 17:21:58 2017 +0200
+++ b/busybox/stuff/udhcp.script	Sat Sep 23 17:56:48 2017 +0200
@@ -15,10 +15,12 @@
 	grep -qe '\(:.* /\|httpfs\|nfs\|smbfs\|ncp\|coda\)' /proc/mounts
 }
 
-logger "$0 interface=$interface ip=$ip ipv6=$ipv6 broadcast=$broadcast subnet=$subnet ipv6prefix=$ipv6prefix router=$router domain=$domain dns=$dns fqdn=$fqdn $@"
+logger "$0 interface=$interface ip=$ip ipv6=$ipv6 broadcast=$broadcast \
+subnet=$subnet ipv6prefix=$ipv6prefix router=$router domain=$domain dns=$dns \
+fqdn=$fqdn mask=$mask lease=$lease tz=$tz tz_name=$tz_name sname=$sname $@"
 
 skip="$(sed "/skipdhcpip=/!d;s/.*skipdhcpip=\([^ ]*\).*/\1/" </proc/cmdline)"
-case " $skip " in *\ ${ip:-$ipv6}\ *) exit 0;; esac
+case ",${skip:-X}," in *,${ip:-$ipv6},*) exit 0;; esac
 
 case "$1" in
 	deconfig)
@@ -36,17 +38,18 @@
 		ip=${ip:-$ipv6}
 		if [ ${ip/:/} == $ip ]; then
 			ifconfig $interface $ip $BROADCAST $NETMASK
+			v6=""
 		else
 			ip -6 addr add $ip/${ipv6mask:-64} $DEV
+			v6="-A inet6"
 		fi
 
 		if [ -n "$router" ] ; then
 			while route del default gw 0.0.0.0 $DEV ; do :; done
-			t=
-			[ ${ip/:/} != $ip ] && t="-A inet6" && ip -6 route flush $DEV
-			metric=0
+			[ -n "$v6" ] && ip -6 route flush $DEV
+			m=0
 			for i in $router ; do
-				route $t add default gw $i $DEV metric $((metric++))
+				route $v6 add default gw $i $DEV metric $((m++))
 			done
 		fi 2>/dev/null