Merge pull request #656 from nlhintz/pull-request

[project/luci.git] / contrib / package / meshwizard / files / usr / bin / meshwizard / helpers / gen_auto-ipv6-dhcpv6-ip.sh

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
index e10677c..9eca11b 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
@@ -1,7 +1,16 @@
 #!/bin/sh
-local PREFIX="$(echo $profile_ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')"
-local MAC="$(ifconfig $1 |grep HWaddr | awk '{ print $5 '})"
-local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
+netrenamed=$1
+
+PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')"
+
+# Get the devices mac address
+device="$(uci -p/var/state -q get network.$1.ifname)"
+if [ -n "$device" ]; then
+       MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})"
+else 
+       MAC="$(cat /sys/class/net/$1/address)"
+       IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
+fi
 
 echo "${PREFIX}${IPV6_UNIQ}:1"