diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-03-15 14:31:14 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-03-15 14:31:14 +0000 |
commit | c7dad17b3fb33460bdf011f7c785a9ebd2da47dc (patch) | |
tree | 27bc16991e9001d44b661162d92d26484294ffba /perl-install/install_any.pm | |
parent | 7640d17c1c60117288767369534d875baf432314 (diff) | |
download | drakx-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar drakx-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.gz drakx-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.bz2 drakx-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.xz drakx-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.zip |
- add dmi_probe()
- some special code on dmi is now moved in dmitable with flags Pkg: and Module:
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r-- | perl-install/install_any.pm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 8abd7eba4..6facb451b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -797,17 +797,10 @@ sub default_packages { push @l, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids}); push @l, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms}); push @l, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4; - my $dmi_System = detect_devices::dmidecode_category('System'); + push @l, map { if_($_->{driver} =~ /^Pkg:(.*)/, $1) } detect_devices::probeall(); + my $dmi_BIOS = detect_devices::dmidecode_category('BIOS'); my $dmi_Base_Board = detect_devices::dmidecode_category('Base Board'); - if ($dmi_System->{Manufacturer} =~ /Dell Computer/ && $dmi_System->{'Product Name'} =~ /Inspiron|Latitude/) { - modules::append_to_modules_loaded_at_startup_for_all_kernels('i8k'); - push @l, "i8kutils"; - } - if ($dmi_System->{Manufacturer} =~ /TOSHIBA/ && $dmi_BIOS->{Vendor} =~ /TOSHIBA/) { - modules::append_to_modules_loaded_at_startup_for_all_kernels('toshiba'); - push @l, "toshutils"; - } if ($dmi_BIOS->{Vendor} eq 'COMPAL' && $dmi_BIOS->{Characteristics} =~ /Function key-initiated network boot is supported/ || $dmi_Base_Board->{Manufacturer} =~ /^ACER/ && $dmi_Base_Board->{'Product Name'} =~ /TravelMate 610/) { modules::append_to_modules_loaded_at_startup_for_all_kernels('acerhk'); |