浏览代码

6rd: pass ipcalc as argument to eval

Instead of grepping for NETWORK after calling ipcalc.sh; pass ipcalc.sh as
argument to eval allowing to use $NETWORK to retrieve the IPv4 prefix
(ip4prefix).

Signed-off-by: Hans Dedecker <[email protected]>
Hans Dedecker 7 年之前
父节点
当前提交
4e48230954
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      package/network/ipv6/6rd/Makefile
  2. 2 2
      package/network/ipv6/6rd/files/6rd.sh

+ 1 - 1
package/network/ipv6/6rd/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6rd
 PKG_VERSION:=9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

+ 2 - 2
package/network/ipv6/6rd/files/6rd.sh

@@ -40,8 +40,8 @@ proto_6rd_setup() {
 
 	# Determine the relay prefix.
 	local ip4prefixlen="${ip4prefixlen:-0}"
-	local ip4prefix=$(ipcalc.sh "$ipaddr/$ip4prefixlen" | grep NETWORK)
-	ip4prefix="${ip4prefix#NETWORK=}"
+	local ip4prefix
+	eval "$(ipcalc.sh "$ipaddr/$ip4prefixlen")";ip4prefix=$NETWORK
 
 	# Determine our IPv6 address.
 	local ip6subnet=$(6rdcalc "$ip6prefix/$ip6prefixlen" "$ipaddr/$ip4prefixlen")