From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 17 Apr 2016 12:49:54 +0000 (+0000)
Subject: base-files: allow to set arbitrary ip address and netmask
X-Git-Tag: reboot~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea6d36111ba9d76ba46b9382d47283aa015e7039;p=oweals%2Fopenwrt.git

base-files: allow to set arbitrary ip address and netmask

Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 49179
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 4256d3ce4d..03d1a36259 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -56,11 +56,11 @@ generate_static_network() {
 
 addr_offset=2
 generate_network() {
-	local ifname macaddr protocol type
+	local ifname macaddr protocol type ipaddr netmask
 
 	json_select network
 		json_select "$1"
-			json_get_vars ifname macaddr protocol
+			json_get_vars ifname macaddr protocol ipaddr netmask
 		json_select ..
 	json_select ..
 
@@ -88,16 +88,18 @@ generate_network() {
 
 	case "$protocol" in
 		static)
-			local ipaddr
+			local ipad
 			case "$1" in
-				lan) ipaddr="192.168.1.1" ;;
-				*) ipaddr="192.168.$((addr_offset++)).1" ;;
+				lan) ipad=${ipaddr:-"192.168.1.1"} ;;
+				*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
 			esac
 
+			netm=${netmask:-"255.255.255.0"}
+
 			uci -q batch <<-EOF
 				set network.$1.proto='static'
-				set network.$1.ipaddr='$ipaddr'
-				set network.$1.netmask='255.255.255.0'
+				set network.$1.ipaddr='$ipad'
+				set network.$1.netmask='$netm'
 				set network.$1.ip6assign='60'
 			EOF
 		;;