summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-23 19:06:08 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-23 19:06:08 +0000
commit626b1c5bdae11678b08acc0bfe941c283c1bb9d7 (patch)
tree67a5caf50af941a247c6552634fe06f60f6026b6 /perl-install/install
parent5de6083313d8a00f17078f9b87b9a1a5c944afee (diff)
downloaddrakx-626b1c5bdae11678b08acc0bfe941c283c1bb9d7.tar
drakx-626b1c5bdae11678b08acc0bfe941c283c1bb9d7.tar.gz
drakx-626b1c5bdae11678b08acc0bfe941c283c1bb9d7.tar.bz2
drakx-626b1c5bdae11678b08acc0bfe941c283c1bb9d7.tar.xz
drakx-626b1c5bdae11678b08acc0bfe941c283c1bb9d7.zip
(default_packages) do not install shorewall & mandi if firefwall is not configured
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm2
2 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e18139267..a7753c35e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -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
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 431deae97..5521bd4db 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -551,8 +551,6 @@ sub default_packages {
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';