Merge branch 'bug/3339' into develop

1 files changed, 4 insertions, 6 deletions

diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp
index 9178a5f2..6bef0032 100644
--- a/puppet/modules/site_config/manifests/initial_firewall.pp
+++ b/puppet/modules/site_config/manifests/initial_firewall.pp
@@ -50,15 +50,13 @@ class site_config::initial_firewall {
     'default_ipv4_firewall':
       command   => '/sbin/iptables-restore < /etc/network/ipv4firewall_up.rules',
       logoutput => true,
-      unless    => '/sbin/shorewall status',
-      require   => [ Package['shorewall'],
-                     File['/etc/network/ipv4firewall_up.rules'] ];
+      unless    => '/etc/init.d/shorewall status',
+      require   => File['/etc/network/ipv4firewall_up.rules'];
 
     'default_ipv6_firewall':
       command   => '/sbin/ip6tables-restore < /etc/network/ipv6firewall_up.rules',
       logoutput => true,
-      unless    => '/sbin/shorewall status',
-      require   => [ Package['shorewall'],
-                     File['/etc/network/ipv6firewall_up.rules'] ];
+      unless    => '/etc/init.d/shorewall status',
+      require   => File['/etc/network/ipv6firewall_up.rules'];
   }
 }