Fix ip6tables configuration using ip6tables-restore.

net-misc/re6stnet/files/grdn-cfg

@@ -45,7 +45,6 @@ re6st-conf --registry "${registry}" --token "${token}" --dir "${configdir}"
 printf '%s\n' "${options[@]}" >> "${configfile}"
 
 echo "
-*filter
 :FORWARD ACCEPT [0:0]
 :OUTPUT DROP [0:0]
 -A INPUT -p udp -m udp --dport 6696 -j ACCEPT
@@ -54,7 +53,6 @@ echo "
 -A INPUT -p tcp -m tcp --dport 50005 -j ACCEPT
 -A OUTPUT -p udp -m udp --dport 6696 -j ACCEPT
 -A OUTPUT -p udp -m udp --dport 326 -j ACCEPT
-COMMIT
 " > "${configdir}/ip6tables.conf"
 
 if [ $save -a $place ] ; then

net-misc/re6stnet/files/grdn-run

@@ -61,6 +61,7 @@ fi
 
 # saving firewall configuration
 ip6tables-save > "${configdir}/ip6tables.save"
+cp "${configdir}/ip6tables.save" "${configdir}/current_ip6tables.conf"
 
 # clean before exiting
 cleanup() {
@@ -69,6 +70,7 @@ cleanup() {
        echo "Removing changes in ip6tables rules"
        ip6tables-restore < "${configdir}/ip6tables.save"
        rm "${configdir}/ip6tables.save"
+       rm "${configdir}/current_ip6tables.conf"
   fi
   echo ""
   exit 0
@@ -78,7 +80,13 @@ trap cleanup SIGHUP SIGINT SIGTERM
 
 # firewall configuration
 if [ -r "${configdir}/ip6tables.conf" ] ; then
-    ip6tables-restore < "${configdir}/ip6tables.conf"
+    # remove line containing "COMMIT"
+    sed -i '/COMMIT/d' "${configdir}/current_ip6tables.conf"
+    # add few rules
+    cat "${configdir}/ip6tables.conf" >> "${configdir}/current_ip6tables.conf"
+    # putting "COMMIT" line back
+    echo "COMMIT" >> "${configdir}/current_ip6tables.conf"
+    ip6tables-restore < "${configdir}/current_ip6tables.conf"
 else
     # accept ports needed for re6stnet
     ip6tables -P FORWARD ACCEPT