[2771] (default_packages) do not install shorewall & mandi if firefwall is not configured

[root-odJJhXpcy38dnm+]

Revision: 2771
Author: tv
Date: 2012-01-23 20:06:08 +0100 (Mon, 23 Jan 2012)
Log Message:
-----------
(default_packages) do not install shorewall & mandi if firefwall is not configured

Modified Paths:
--------------
drakx/trunk/perl-install/install/NEWS
drakx/trunk/perl-install/install/any.pm

Modified: drakx/trunk/perl-install/install/NEWS
===================================================================
--- drakx/trunk/perl-install/install/NEWS 2012-01-23 19:06:04 UTC (rev 2770)
+++ drakx/trunk/perl-install/install/NEWS 2012-01-23 19:06:08 UTC (rev 2771)
@@ -2,6 +2,7 @@
o allow using nilfs2 during install
o enable to set label on btrfs & nilfs fses as well as on swap
o preserve UUID when reformating a nilfs fs
+- do not install shorewall & mandi if firefwall is not configured

Version 13.76 - 20 January 2012


Modified: drakx/trunk/perl-install/install/any.pm
===================================================================
--- drakx/trunk/perl-install/install/any.pm 2012-01-23 19:06:04 UTC (rev 2770)
+++ drakx/trunk/perl-install/install/any.pm 2012-01-23 19:06:08 UTC (rev 2771)
@@ -551,8 +551,6 @@
push @l, map { $_->{BOOTPROTO} eq 'dhcp' ? $_->{DHCP_CLIENT} || 'dhcp-client' : () } values %{$o->{net}{ifcfg}};
# will get auto selected at summary stage for bootloader:
push @l, qw(acpi acpid mageia-gfxboot-theme);
- # will get auto selected at summary stage for firewall:
- push @l, qw(shorewall mandi-ifw);
# only needed for CDs/DVDs installations:
push @l, 'perl-Hal-Cdroms' if $o->{method} eq 'cdrom';