diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | bin/drakgw | 2 | ||||
| -rw-r--r-- | lib/network/drakfirewall.pm | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,5 @@ +- drakgw, drakfirewall: install shorewall-ipv6 too (mga#9401) + 1.21: - translation updates @@ -366,7 +366,7 @@ sub gw_configure() { N("Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation.")); } - $in->do_pkgs->ensure_is_installed('shorewall', '/sbin/shorewall') or $in->exit(-1); + $in->do_pkgs->ensure_files_are_installed([ [ qw(shorewall shorewall) ], [ qw(shorewall-ipv6 shorewall6) ] ], $::isInstall) or $in->exit(-1); my $_wait_configuring = $in->wait_message(N("Configuring..."), N("Configuring firewall...")); diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm index ff87724..e679415 100644 --- a/lib/network/drakfirewall.pm +++ b/lib/network/drakfirewall.pm @@ -195,7 +195,7 @@ sub set_ports { my ($do_pkgs, $disabled, $ports, $log_net_drop, $o_in) = @_; if (!$disabled || -x "$::prefix/sbin/shorewall") { - $do_pkgs->ensure_binary_is_installed('shorewall', 'shorewall', $::isInstall) or return; + $do_pkgs->ensure_files_are_installed([ [ qw(shorewall shorewall) ], [ qw(shorewall-ipv6 shorewall6) ] ], $::isInstall) or return; my $shorewall = network::shorewall::read(!$disabled && $o_in); if (!$shorewall) { log::l("unable to read shorewall configuration, skipping installation"); |