From cdeeffc2316a8a814e31938487798c8bb7e874e9 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 2 Oct 2008 16:38:29 +0000 Subject: find default desktop choice according to compssUsers.pl (useful for netbook/nettop systems) --- perl-install/install/NEWS | 5 ++++- perl-install/install/steps_interactive.pm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index bae295452..9ea62bd33 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,7 +1,10 @@ - when upgrading a kde3 box, force installation of task-kde4 - adjust some help IDs - log activation of light desktop mode -- gtk and interactive install: preselect proper default desktop choice +- gtk and interactive install: + o find default desktop choice according to compssUsers.pl + (useful for netbook/nettop systems) + o preselect proper default desktop choice Version 11.66.1 - 2 October 2008 diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index ea71bb81f..cf3bfacc8 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -494,7 +494,7 @@ sub _chooseDesktop { my $title = N("Desktop Selection"); my $message = N("You can choose your workstation desktop profile."); - my $default_choice = $choices->[0]; + my $default_choice = (find { $rpmsrate_flags_chosen->{"CAT_" . $_->[0]} } @l) || $l[0]; my $choice = $default_choice; if ($o->isa('interactive::gtk')) { $choice = install::steps_gtk::reallyChooseDesktop($o, $title, $message, \@l, $default_choice); -- cgit v1.2.1