Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib/meshwizard: Fix getting of mac address when the interface is not up yet, fix typo in setup_olsrd.sh

Browse source
This commit is contained in:
Manuel Munz 2012-06-03 08:46:46 +00:00
parent 5ff3e0d7ba
commit 67e8793393
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
View file

@ -1,7 +1,16 @@
#!/bin/sh
netrenamed=$1
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 }')"
# Get the devices mac address
local device="$(uci -p/var/state -q get network.$1.ifname)"
if [ -n "$device" ]; then
local MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})"
else
local MAC="$(cat /sys/class/net/$1/address)"
local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
fi
echo "${PREFIX}${IPV6_UNIQ}:1"

6
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
View file

@ -27,11 +27,7 @@ EOF
local ip6addr
if [ "$profile_ipv6" = 1 ]; then
if [ "$profile_ipv6_config" = "auto-ipv6-dhcpv6" ]; then
# get interface mac
local device="$(uci -p/var/state -q get network.$netrenamed.ifname)"
if [ -n "device" ]; then
ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $device)"
fi
ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $netrenamed)"
uci set network.$netrenamed.ip6addr="${ip6addr}/112"
fi
fi

2
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
View file

@ -22,7 +22,7 @@ handle_interfacedefaults() {
config_foreach handle_interfacedefaults InterfaceDefaults
# Set basic olsrd settings
if [ "profile_ipv6" = 1 ]; then
if [ "$profile_ipv6" = 1 ]; then
uci set olsrd.olsrd.IpVersion="6and4"
fi
uci_commitverbose "Setup olsr basic settings" olsrd