From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 17 Nov 2010 19:13:11 +0000 (+0000)
Subject: [package] 6in4: implement metric option
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=b2e516b799ddbb037df61583658f5c63ed3f698d;hp=c018564bc733d6735763a04cfcc4e5af426881b9;ds=sidebyside

[package] 6in4: implement metric option


SVN-Revision: 24022
---

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index d03d2396ff..905d7f810b 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 2af1f74b29..5f8dfffe57 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -42,6 +42,9 @@ setup_interface_6in4() {
 	local ttl
 	config_get ttl "$cfg" ttl
 
+	local metric
+	config_get metric "$cfg" metric
+
 	local defaultroute
 	config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -70,7 +73,7 @@ setup_interface_6in4() {
 		uci_set_state network "$cfg" ip6addr $local6
 
 		[ "$defaultroute" = 1 ] && {
-			ip -6 route add ::/0 dev $link
+			ip -6 route add ::/0 ${metric:+metric $metric} dev $link
 			uci_set_state network "$cfg" defaultroute 1
 		}