diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/network/shorewall.pm | 14 |
2 files changed, 1 insertions, 14 deletions
@@ -1,3 +1,4 @@ +- drop shorewall 2->3 upgrade support - correct path to shorewall config - do not exec pkexec but run it so it has a parent process to fix double fork issues mga#11184 mga#12364 diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm index 4532412..da7f304 100644 --- a/lib/network/shorewall.pm +++ b/lib/network/shorewall.pm @@ -140,18 +140,6 @@ sub ports_by_proto { \%ports_by_proto; } -sub upgrade_to_shorewall3() { - #- the 'FW' option has been removed from shorewall.conf as of shorewall 3.0 - my $ipsecfile_ok; - substInFile { - undef $_ if /^\s*FW=/; - if ((/^\s*IPSECFILE=/ || eof) && !$ipsecfile_ok) { - $ipsecfile_ok = 1; - $_ = "IPSECFILE=zones\n"; - } - } "$::prefix${shorewall_root}/shorewall.conf"; -} - sub write { my ($conf, $o_in) = @_; my $use_pptp = any { /^ppp/ && cat_("$::prefix/etc/ppp/peers/$_") =~ /pptp/ } @{$conf->{net_zone}}; @@ -221,8 +209,6 @@ What do you want to do?"), )); set_config_file('masq', if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ])); - upgrade_to_shorewall3(); - require services; if ($conf->{disabled}) { services::disable('shorewall', $::isInstall); |