From e1a74567732f57c964391c11c68fd83d60dad81e Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 17 Nov 2010 19:20:00 +0000 Subject: [PATCH] [backfire] merge r24022 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24025 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6in4/Makefile | 2 +- package/6in4/files/6in4.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 50f4178ab..f5d3dfc84 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 } -- 2.35.1