diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-11 11:39:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-11 11:39:58 +0000 |
| commit | c40b2c2150a6e125956b09ddd3a4ee581bf4877b (patch) | |
| tree | 739d9cfab25af29e9c30781411b62bc6a80241b8 | |
| parent | 6ee8e97acb02ccd9c2a1359f9146b4578dc81c2d (diff) | |
| download | drakx-c40b2c2150a6e125956b09ddd3a4ee581bf4877b.tar drakx-c40b2c2150a6e125956b09ddd3a4ee581bf4877b.tar.gz drakx-c40b2c2150a6e125956b09ddd3a4ee581bf4877b.tar.bz2 drakx-c40b2c2150a6e125956b09ddd3a4ee581bf4877b.tar.xz drakx-c40b2c2150a6e125956b09ddd3a4ee581bf4877b.zip | |
- fix the setting of compssUsersChoices in auto_install when it is empty
- set the default compssUsersChoices adapted to the server meta_class
| -rw-r--r-- | perl-install/install_any.pm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 6ca56b3ca..d78b955e2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -344,15 +344,19 @@ sub setDefaultPackages { #- if no cleaning needed, populate by default, clean is used for second or more call to this function. unless ($clean) { - if ($::auto_install && $o->{compssUsersChoice}{ALL}) { + if ($::auto_install && ($o->{compssUsersChoice} || {})->{ALL}) { $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}{flags}} } @{$o->{compssUsersSorted}}; } if (!$o->{compssUsersChoice} && !$o->{isUpgrade}) { #- by default, choose: - $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG', 'X'; - $o->{lang} eq 'eu_ES' and $o->{compssUsersChoice}{KDE} = 0; - $o->{compssUsersChoice}{$_} = 1 - foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station'; + if ($o->{meta_class} eq 'server') { + $o->{compssUsersChoice}{$_} = 1 foreach 'X', 'MONITORING', 'NETWORKING_REMOTE_ACCESS_SERVER'; + } else { + $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG', 'X'; + $o->{lang} eq 'eu_ES' and $o->{compssUsersChoice}{KDE} = 0; + $o->{compssUsersChoice}{$_} = 1 + foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station'; + } } } $o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo', 'sound'); |