summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-23 18:17:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-23 18:17:13 +0000
commitd2428a8fc6656984d7050a91b6ef6578d05876e1 (patch)
tree0df008e83a24aedae90daee001f28836c3200ac7 /perl-install/install_any.pm
parentc82f87d93fa174447973189852356f9a25364411 (diff)
downloaddrakx-d2428a8fc6656984d7050a91b6ef6578d05876e1.tar
drakx-d2428a8fc6656984d7050a91b6ef6578d05876e1.tar.gz
drakx-d2428a8fc6656984d7050a91b6ef6578d05876e1.tar.bz2
drakx-d2428a8fc6656984d7050a91b6ef6578d05876e1.tar.xz
drakx-d2428a8fc6656984d7050a91b6ef6578d05876e1.zip
do not force X flag, have it selected for any "Graphical Environment"
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 18bc4ead7..a6a37cd8b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -361,14 +361,13 @@ sub setPackages {
}
if (!$o->{compssUsersChoice} && !$o->{isUpgrade}) {
#- by default, choose:
- $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG';
+ $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG', 'X';
$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');
$o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
$o->{compssUsersChoice}{SYSTEM} = 1;
- $o->{compssUsersChoice}{X} = 1 if $o->{interactive};
$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
$o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms();
$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();