diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-01-25 15:09:00 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-01-25 15:09:00 +0000 |
| commit | 82be9eb33cae26ba998c4e8a926f6fcff2ba0230 (patch) | |
| tree | 2aa223d3e18a2a1177b7c4a7530cb967e1031792 | |
| parent | 12c946b22963a7b5e7607d2e93c6ae0857f66795 (diff) | |
| download | drakx-net-82be9eb33cae26ba998c4e8a926f6fcff2ba0230.tar drakx-net-82be9eb33cae26ba998c4e8a926f6fcff2ba0230.tar.gz drakx-net-82be9eb33cae26ba998c4e8a926f6fcff2ba0230.tar.bz2 drakx-net-82be9eb33cae26ba998c4e8a926f6fcff2ba0230.tar.xz drakx-net-82be9eb33cae26ba998c4e8a926f6fcff2ba0230.zip | |
shorewall: drop shorewall 2->3 upgrade support
| -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); |