[tools]: add e2fsprogs to tools and use that instead of libuuid

[openwrt.git] / package / 6to4 / files / 6to4.sh

diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 9dfd7cd..31dd4b7 100755 (executable)
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -43,6 +43,9 @@ setup_interface_6to4() {
        local ttl
        config_get ttl "$cfg" ttl
 
+       local metric
+       config_get metric "$cfg" metric
+
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -91,7 +94,7 @@ setup_interface_6to4() {
 
                [ "$defaultroute" = 1 ] && {
                        logger -t "$link" " * Adding default route"
-                       ip -6 route add 2000::/3 via ::192.88.99.1 dev $link metric 1
+                       ip -6 route add 2000::/3 via ::192.88.99.1 metric ${metric:-1} dev $link
                        uci_set_state network "$cfg" defaultroute 1
                }
 
@@ -116,8 +119,8 @@ setup_interface_6to4() {
                                local sid="6to4_$cfg"
 
                                uci -q batch <<-EOF
-                                       delete radvd.iface_$sid
-                                       delete radvd.prefix_$sid
+                                       revert radvd.iface_$sid
+                                       revert radvd.prefix_$sid
                                        set radvd.iface_$sid=interface
                                        set radvd.iface_$sid.ignore=0
                                        set radvd.iface_$sid.interface=${adv_interface:-lan}
@@ -165,8 +168,8 @@ stop_interface_6to4() {
                        local sid="6to4_$cfg"
 
                        uci -q batch <<-EOF
-                               delete radvd.iface_$sid
-                               delete radvd.prefix_$sid
+                               revert radvd.iface_$sid
+                               revert radvd.prefix_$sid
                        EOF
 
                        /etc/init.d/radvd enabled && /etc/init.d/radvd restart