diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-08-31 21:10:50 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-08-31 21:10:50 +0000 |
| commit | 9fbed9ab76940bea1d9285057c33bcb4a585b0ee (patch) | |
| tree | a53dc51c1b2a5906385ba3e138c4e1131b399ded | |
| parent | afabd983d6218b249ad134713206f851a76bc704 (diff) | |
| download | drakx-backup-do-not-use-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar drakx-backup-do-not-use-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.gz drakx-backup-do-not-use-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.bz2 drakx-backup-do-not-use-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.tar.xz drakx-backup-do-not-use-9fbed9ab76940bea1d9285057c33bcb4a585b0ee.zip | |
in non expert mode, only display the list of *installed* display managers.
(interface team request)
if no dm is installed, then switch back to expert mode behaviour and display
all dm and install them if needed.
| -rw-r--r-- | perl-install/standalone/drakedm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 7e6a824ea..9106dd051 100644 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -41,6 +41,9 @@ foreach (cat_($cfg_file)) { $dm = uc($1) if /^DISPLAYMANAGER=(.*)$/; } +my @raw_list = sort keys %dm; +my @list = $::expert ? @raw_list : (grep { -e $dm{$_}->[1] } @raw_list) or @raw_list; + start: if ($in->ask_from(N("Choosing a display manager"), formatAlaTeX(N("X11 Display Manager allows you to graphically log @@ -48,7 +51,8 @@ into your system with the X Window System running and supports running several different X sessions on your local machine at the same time.")), [ { - list => [ sort keys %dm ], + allow_empty_list => 1, + list => \@list, val => \$dm, type => 'list', format => sub { $dm{$_[0]}[0] }, |