Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/lfs/tor b/lfs/tor
index ae63d961a376c387cece335e62915d1006fcc1b1..6161a56484098f76ff78f92964a56f9febadbe0d 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "libevent2"
 

diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index 4fef577ac7fb2aee0118f0dad1b4643898c65061..d631e867f915e123e918383b3c9caa86af1e5a71 100644 (file)
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,13 +9,13 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+
 function tor_is_enabled() {
        [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
 }
 
 function setup_firewall() {
-       eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
-
        # Flush all rules.
        flush_firewall