little changes in core8 - backup before extract

changed if clause in wirelessctrl if key is not existing eq on

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1228 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/8/update.sh b/config/rootfiles/core/8/update.sh
index 6deda161aa23946e5bb531ee5b884bdf25a41cb8..c1952ecd828ae1f4e9ee3fa76224ccbb8644b202 100644 (file)
--- a/config/rootfiles/core/8/update.sh
+++ b/config/rootfiles/core/8/update.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
 depmod -a
-echo "DROPWIRELESSFORWARD=on" >> /var/ipfire/optionsfw/settings
-echo "DROPWIRELESSINPUT=on" >> /var/ipfire/optionsfw/settings
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+

diff --git a/config/rootfiles/core/9/update.sh b/config/rootfiles/core/9/update.sh
index a97e2ca0707755052aa2374d4a7ad1ad68476f3a..3423b62f94244eb36a684c7c3767b5bf3da9b0eb 100644 (file)
--- a/config/rootfiles/core/9/update.sh
+++ b/config/rootfiles/core/9/update.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
 depmod -a
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1

diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 65680e5ee26d9cab07f395ada443ecfce5f0a8a9..ad76cfb8b677d7c4dcd78c4699c29171805c071f 100644 (file)
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -102,12 +102,12 @@ int main(void)
         }
 
         /* with this rule you can disable the logging of the dropped wireless input packets*/
-        if(findkey(kv, "DROPWIRELESSINPUT", buffer) && !strcmp(buffer,"on")){
+        if(!findkey(kv, "DROPWIRELESSINPUT", buffer) || strcmp(buffer,"off")){
                 snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -i %s -j LOG --log-prefix 'DROP_Wirelessinput'", blue_dev);
                 safe_system(command);
         }
         /* with this rule you can disable the logging of the dropped wireless forward packets*/
-        if(findkey(kv, "DROPWIRELESSFORWARD", buffer) && !strcmp(buffer,"on")){
+        if(!findkey(kv, "DROPWIRELESSFORWARD", buffer) || strcmp(buffer,"off")){
                 snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -i %s -j LOG --log-prefix 'DROP_Wirelessforward'", blue_dev);
                 safe_system(command);
         }