summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-22 20:12:07 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-22 20:12:07 +0000
commit15219f18015b6aba6285b4d89daaf7eed9884a1c (patch)
treebdd26bce440c942ea26f205c54fe1b84413deca5
parentc4bafbcd3deb4e050ac9be76a973ff9438dafda5 (diff)
downloaddraklive-install-15219f18015b6aba6285b4d89daaf7eed9884a1c.tar
draklive-install-15219f18015b6aba6285b4d89daaf7eed9884a1c.tar.gz
draklive-install-15219f18015b6aba6285b4d89daaf7eed9884a1c.tar.bz2
draklive-install-15219f18015b6aba6285b4d89daaf7eed9884a1c.tar.xz
draklive-install-15219f18015b6aba6285b4d89daaf7eed9884a1c.zip
1.13.1
-rw-r--r--Makefile2
-rw-r--r--NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8413858..c688aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME = draklive-install
-VERSION = 1.13
+VERSION = 1.13.1
dli_confdir = ${sysconfdir}/$(NAME).d
dli_sysconfigdir = $(dli_confdir)/sysconfig
diff --git a/NEWS b/NEWS
index 1d4ad58..9dc590a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+1.13.1:
+- translation updates
+
1.13:
- use new drakxtools code to remove unused packages
t/drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.zip'>drakx-684bc77e94460e3cc30b253f9a4f4b4b927e2168.zip
(setDefaultPackages) better support for Toshiba laptops: preload
toshiba driver and install toshutils (inspirated from drivers/char/toshiba.c's audit)
Diffstat
-rw-r--r--perl-install/install_any.pm8
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}});