diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-11-17 19:13:11 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-11-17 19:13:11 +0000 |
commit | 89917ff1d0c9d12f2f533d62daf343588bafeddc (patch) | |
tree | 35a4c2fdc14c2ed1fff33eb54aa3e74f16bc1561 | |
parent | 8eec2f821452e859bab5a409c4aacd5f4950ad72 (diff) | |
download | upstream-89917ff1d0c9d12f2f533d62daf343588bafeddc.tar.gz upstream-89917ff1d0c9d12f2f533d62daf343588bafeddc.tar.bz2 upstream-89917ff1d0c9d12f2f533d62daf343588bafeddc.zip |
6in4: implement metric option
SVN-Revision: 24022
-rw-r--r-- | package/6in4/Makefile | 2 | ||||
-rwxr-xr-x | package/6in4/files/6in4.sh | 5 |
2 files changed, 5 insertions, 2 deletions
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 } |