From d2428a8fc6656984d7050a91b6ef6578d05876e1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 23 Sep 2001 18:17:13 +0000 Subject: do not force X flag, have it selected for any "Graphical Environment" --- perl-install/install_any.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'perl-install/install_any.pm') 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(); -- cgit v1.2.1