From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 17 Nov 2010 19:12:28 +0000 (+0000)
Subject: [package] 6to4: implement metric option
X-Git-Tag: fast2504n-3.10.28-merged~10506
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=071cb9532438a395d1e31cc1055fce1eaf2a6c6c;p=openwrt.git

[package] 6to4: implement metric option


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24021 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index cf9f74136b..3becce9c5f 100644
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
-PKG_VERSION:=1
+PKG_VERSION:=2
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index bbf8dba41b..31dd4b7c88 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -43,6 +43,9 @@ setup_interface_6to4() {
 	local ttl
 	config_get ttl "$cfg" ttl
 
+	local metric
+	config_get metric "$cfg" metric
+
 	local defaultroute
 	config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -91,7 +94,7 @@ setup_interface_6to4() {
 
 		[ "$defaultroute" = 1 ] && {
 			logger -t "$link" " * Adding default route"
-			ip -6 route add 2000::/3 via ::192.88.99.1 dev $link metric 1
+			ip -6 route add 2000::/3 via ::192.88.99.1 metric ${metric:-1} dev $link
 			uci_set_state network "$cfg" defaultroute 1
 		}