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

contrib/meshwizard: Use the new interfaces syntax instead of the old alias syntax for dhcp interfaces

Browse source
This commit is contained in:
Manuel Munz 2013-01-29 22:32:03 +00:00
parent 9846cfc093
commit 13a7013acd
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/meshwizard/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard PKG_NAME:=meshwizard
PKG_RELEASE:=0.0.8-3 PKG_RELEASE:=0.0.9-1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

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

@ -58,7 +58,7 @@ if [ "$net_dhcp" == 1 ]; then
fi fi
} }
config_load network config_load network
config_foreach handle_dhcpalias alias config_foreach handle_dhcpalias interface
# Get IP/netmask and start-ip for $net dhcp # Get IP/netmask and start-ip for $net dhcp
# If no dhcprange is given in /etc/config/meshwizard we autogenerate one # If no dhcprange is given in /etc/config/meshwizard we autogenerate one
@ -69,15 +69,15 @@ if [ "$net_dhcp" == 1 ]; then
fi fi
eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange 1 0) eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange 1 0)
# setup wifi-dhcp interface or alias # setup wifi-dhcp interface or alias (using interface notation)
# Setup alias for $net # Setup alias for $net
if [ "$vap" == 1 ]; then if [ "$vap" == 1 ]; then
uci set network.${netrenamed}dhcp=interface uci set network.${netrenamed}dhcp=interface
else else
uci set network.${netrenamed}dhcp=alias uci set network.${netrenamed}dhcp=interface
uci set network.${netrenamed}dhcp.interface="$netrenamed" uci set network.${netrenamed}dhcp.ifname="@${netrenamed}"
fi fi
uci batch <<- EOF uci batch <<- EOF
@ -86,5 +86,4 @@ if [ "$net_dhcp" == 1 ]; then
set network.${netrenamed}dhcp.netmask="$NETMASK" set network.${netrenamed}dhcp.netmask="$NETMASK"
EOF EOF
uci_commitverbose "Setup interface for ${netrenamed}dhcp" network uci_commitverbose "Setup interface for ${netrenamed}dhcp" network
fi fi