diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-29 14:59:56 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-29 14:59:56 +0000 |
| commit | 684bc77e94460e3cc30b253f9a4f4b4b927e2168 (patch) | |
| tree | 70edfbb76700601bc21461c2753b9f79ddc4fee9 | |
| parent | dd973fc457dc5e6b2e1e452bca47144f2716c514 (diff) | |
| download | drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.tar drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.tar.gz drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.tar.bz2 drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.tar.xz drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.zip | |
(setDefaultPackages) better support for Toshiba laptops: preload
toshiba driver and install toshutils (inspirated from
drivers/char/toshiba.c's audit)
| -rw-r--r-- | perl-install/install_any.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index b98e84402..9d52210f5 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -648,11 +648,15 @@ sub setDefaultPackages { push @{$o->{default_packages}}, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids}); push @{$o->{default_packages}}, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms}); push @{$o->{default_packages}}, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4; - my ($dmi) = grep { $_->{name} eq 'System' } detect_devices::dmidecode(); - if ($dmi->{Manufacturer} eq "Dell Computer" && member($dmi->{'Product Name'}, qw(Inspiron Latitude))) { + my %dmi = map { $_->{name} => $_ } detect_devices::dmidecode(); + if ($dmi{System}{Manufacturer} eq "Dell Computer" && member($dmi{System}{'Product Name'}, qw(Inspiron Latitude))) { modules::append_to_modules_loaded_at_startup($_, 'i8k') foreach "$::prefix/etc/modules", "$::prefix/etc/modprobe.preload"; push @{$o->{default_packages}}, "i8kutils" } + if ($dmi{System}{Manufacturer} eq 'TOSHIBA' && $dmi{BIOS}{Vendor} eq 'TOSHIBA') { + modules::append_to_modules_loaded_at_startup($_, 'toshiba') foreach "$::prefix/etc/modules", "$::prefix/etc/modprobe.preload"; + push @{$o->{default_packages}}, "toshutils"; + } push @{$o->{default_packages}}, "grub" if isLoopback(fs::get::root($o->{fstab})); push @{$o->{default_packages}}, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}}); |