summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-03 12:10:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-03 12:10:33 +0000
commit1e4e43c73bd501215d4db9df57f4ed1481997d8f (patch)
tree39d411c8f6657234f9dd576449e52797e250ef45
parent0174312dcc18f17ebd089f409f035b894861fd51 (diff)
downloaddrakx-backup-do-not-use-1e4e43c73bd501215d4db9df57f4ed1481997d8f.tar
drakx-backup-do-not-use-1e4e43c73bd501215d4db9df57f4ed1481997d8f.tar.gz
drakx-backup-do-not-use-1e4e43c73bd501215d4db9df57f4ed1481997d8f.tar.bz2
drakx-backup-do-not-use-1e4e43c73bd501215d4db9df57f4ed1481997d8f.tar.xz
drakx-backup-do-not-use-1e4e43c73bd501215d4db9df57f4ed1481997d8f.zip
(setPackages): handle Flag:<theflag>
(setPackages): install kernel22 if install kernel is a 2.2
-rw-r--r--perl-install/install_any.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d5c957a24..fa4ffbc8f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -298,6 +298,7 @@ sub setPackages {
push @{$o->{default_packages}}, "nfs-utils-clients" if $o->{method} eq "nfs";
push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
+ push @{$o->{default_packages}}, "kernel22" if c::kernel_version() =~ /^\Q2.2/;
push @{$o->{default_packages}}, "kernel22-secure" if $o->{security} > 3;
push @{$o->{default_packages}}, "kernel-smp" if detect_devices::hasSMP();
push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia};
@@ -329,6 +330,7 @@ sub setPackages {
foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
}
$o->{compssUsersChoice}{TV} = 1 if grep { $_->{driver} eq 'bttv' } detect_devices::probeall();
+ $o->{compssUsersChoice}{$_} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
$o->{compssUsersChoice}{SYSTEM} = 1;
$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();