[package] configure the IPv6 from /etc/config/network and remove 6scripts's prefix...

SVN-Revision: 16683

diff --git a/ipv6/6scripts/Makefile b/ipv6/6scripts/Makefile
index a55c290cb29c19d22237a5fb276e3b937ff1bec2..1174f4bf04815af370421b36b403b031592d0bf2 100644 (file)
--- a/ipv6/6scripts/Makefile
+++ b/ipv6/6scripts/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6scripts
 PKG_VERSION:=0.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/ipv6/6scripts/files/6tunnel.conf b/ipv6/6scripts/files/6tunnel.conf
index 7bf510fe5cb700408f64bbba85fdddcd61f5f585..d334338f84c9ab1ec2aecd71b5ffb6ac444c7c3c 100644 (file)
--- a/ipv6/6scripts/files/6tunnel.conf
+++ b/ipv6/6scripts/files/6tunnel.conf
@@ -1,19 +1,16 @@
 config 6tunnel
-    option tnlifname    'sixbone'
-    # provide your tunnel providers' ipv4 address
-    option remoteip4   ''
-    # provide your public ipv4 address
+       option tnlifname        'sixbone'
+       # provide your tunnel providers' ipv4 address
+       option remoteip4        ''
+       # provide your public ipv4 address
        option localip4         ''
        # provide your local ipv6 address including prefix, 
        # eg. 2001:610::2/64
        option localip6         ''
        # provide your tunnel providers' ipv6 address excluding 
        # prefix, eg. 2001:610::1
-       option remoteip6                ''
-       # this should be a network prefix and gateway address 
-       # for your local lan eg 2001:610:1000:1/64
-       option prefix           '/64'
-    # this should provide an mtu for your tunnel interface
-    option mtu          '1280'
-    # this should provide a ttl for your tunnel interface
-    option ttl          '64'
+       option remoteip6        ''
+       # this should provide an mtu for your tunnel interface
+       option mtu              '1280'
+       # this should provide a ttl for your tunnel interface
+       option ttl              '64'

diff --git a/ipv6/6scripts/files/6tunnel.init b/ipv6/6scripts/files/6tunnel.init
index acd79bff2ca63010d6e2747f72933d23a9344e04..5c21e7db9c83aac2b8add8dcf98830b9d401ae93 100644 (file)
--- a/ipv6/6scripts/files/6tunnel.init
+++ b/ipv6/6scripts/files/6tunnel.init
@@ -15,7 +15,6 @@ start_service() {
        config_get localip4 "$section" localip4
        config_get localip6 "$section" localip6
        config_get remoteip6 "$section" remoteip6
-       config_get prefix "$section" prefix
        config_get ttl "$section" ttl
        config_get mtu "$section" mtu
 
@@ -25,7 +24,6 @@ start_service() {
        ip tunnel change $tnlifname ttl $ttl
        ip addr add $localip6 dev $tnlifname
        ip -6 route add 2000::/3 via $remoteip6
-       ip -6 addr add $prefix dev $LAN
 }
 
 stop_service() {
@@ -41,11 +39,9 @@ stop_service() {
        config_get localip4 "$section" localip4
        config_get localip6 "$section" localip6
        config_get remoteip6 "$section" remoteip6
-       config_get prefix "$section" prefix
        config_get ttl "$section" ttl
        config_get mtu "$section" mtu
 
-       ip -6 addr del $prefix dev $LAN
        ip -6 ro del 2000::/3 via $remoteip6
        ip -6 ro del ::/0 dev $tnlifname
        ip addr del $localip6 dev $tnlifname