summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-10-02 16:38:29 +0000
committerOlivier Blin <oblin@mandriva.com>2008-10-02 16:38:29 +0000
commitcdeeffc2316a8a814e31938487798c8bb7e874e9 (patch)
tree10f1edf317a18f96d80ba39419baf09f81c8ab99 /perl-install
parenta728762ad073d64e3ceb612802dbe623bca1ffca (diff)
downloaddrakx-cdeeffc2316a8a814e31938487798c8bb7e874e9.tar
drakx-cdeeffc2316a8a814e31938487798c8bb7e874e9.tar.gz
drakx-cdeeffc2316a8a814e31938487798c8bb7e874e9.tar.bz2
drakx-cdeeffc2316a8a814e31938487798c8bb7e874e9.tar.xz
drakx-cdeeffc2316a8a814e31938487798c8bb7e874e9.zip
find default desktop choice according to compssUsers.pl (useful for netbook/nettop systems)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS5
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 5 insertions, 2 deletions
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);