summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-08 10:36:43 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-08 10:36:43 +0000
commit6e10c0c5cf2caeb3be3227c9d26915255cb6e270 (patch)
tree3166d70e2d0ffe7cdf7bf672c6b94cf0faff9dda /perl-install
parentebdea8f5eae62bb8151ee8e056bcca7b6bcbc05b (diff)
downloaddrakx-6e10c0c5cf2caeb3be3227c9d26915255cb6e270.tar
drakx-6e10c0c5cf2caeb3be3227c9d26915255cb6e270.tar.gz
drakx-6e10c0c5cf2caeb3be3227c9d26915255cb6e270.tar.bz2
drakx-6e10c0c5cf2caeb3be3227c9d26915255cb6e270.tar.xz
drakx-6e10c0c5cf2caeb3be3227c9d26915255cb6e270.zip
(default_packages) install more packages earlier, preventing useless installing
steps later at summary stage also fix "program not found: grub-gfxmenu" error message while installing (which probably happens since we moved bootloader setup later, at summary)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS4
-rw-r--r--perl-install/install/any.pm5
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9f60ce8cb..2e18167e2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- install more packages earlier (acpi{,d}, dhcp client, firewall & bootloader
+ stuff), preventing useless installing steps later at summary stage & also
+ fixing "program not found: grub-gfxmenu" error message while installing
+
Version 13.63 - 07 September 2011
- better microcode_ctl management
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 8f90028c0..0a44e2872 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -548,6 +548,11 @@ sub default_packages {
push @l, 'cpufreq' if detect_devices::hasCPUFreq();
push @l, 'apmd' if -e "/proc/apm";
push @l, detect_devices::probe_name('Pkg');
+ 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);
my $dmi_BIOS = detect_devices::dmidecode_category('BIOS');
my $dmi_Base_Board = detect_devices::dmidecode_category('Base Board');