summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-17 19:13:11 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-17 19:13:11 +0000
commita21cc0882d2e77f0d383ea85e0ee55d3a92637eb (patch)
tree5fb9e5bfcd0de30bde7168f9292d8a04353090b3
parent071cb9532438a395d1e31cc1055fce1eaf2a6c6c (diff)
[package] 6in4: implement metric option
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24022 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/6in4/Makefile2
-rwxr-xr-xpackage/6in4/files/6in4.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index d03d2396f..905d7f810 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 2af1f74b2..5f8dfffe5 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
}