wirelessctrl: Don't read nodrop file any more.

diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index e27241f5617e93b53d68ce760df57ccf0d9ea034..863b420d3a44a83b9747bbc960d59563a436daca 100644 (file)
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,9 +9,9 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-function setup_firewall() {
-       eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 
+function setup_firewall() {
        # Flush all rules.
        flush_firewall
 

diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 450aa368fec86126cf12d71e6907c3d9a26a239a..bd3e60d6743982f205e88c74104f18488934fe60 100644 (file)
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -101,9 +101,6 @@ int main(void)
                                                        exit(0);
                                }
 
-                               if ((fd = fopen(CONFIG_ROOT "/wireless/nodrop", "r")))
-                                       return 0;
-
                                /* register exit handler to ensure the block rule is always present */
                                atexit(exithandler);