diff options
Diffstat (limited to 'perl-install/standalone/drakedm')
| -rwxr-xr-x[-rw-r--r--] | perl-install/standalone/drakedm | 62 |
1 files changed, 35 insertions, 27 deletions
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 2547cd901..6e7d42304 100644..100755 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxDM -- Display Manager chooser -# Copyright (C) 2003 MandrakeSoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2003-2008 Mandriva (thierry.vignaud.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,30 +24,31 @@ use common; use any; use interactive; use services; +use run_program; + +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png"; my $in = 'interactive'->vnew('su'); my $cfg_file = '/etc/sysconfig/desktop'; -my %dm = ('GNOME' => [ 'GDM (GNOME Display Manager)', '/usr/bin/gdm', 'gdm' ], - 'KDM' => [ 'KDM (KDE Display Manager)', '/usr/bin/kdm', 'kdebase-kdm' ], - 'KDE' => [ 'MdkKDM (Mandrake Display Manager)', '/usr/bin/mdkkdm', 'mdkkdm' ], - 'XDM' => [ 'XDM (X Display Manager)', '/usr/bin/X11/xdm', 'XFree86' ], - ); - -my $dm; +my @list = map { + my %l = map { /(\S+)=(.*)/ } cat_($_); + \%l; +} sort(glob("/usr/share/X11/dm.d/*.conf")); -foreach (cat_($cfg_file)) { - $dm = uc($1) if /^DISPLAYMANAGER=(.*)$/; -} +my @_DESCRIPTIONS_for_i18n = ( + N("GDM (GNOME Display Manager)"), + N("SDDM (Simple Desktop Display Manager)"), + N("XDM (X Display Manager)"), +); -if (!$dm) { - $dm = 'KDE'; - log::explanations("Defaulting to $dm for display manager") +if (!$::expert) { + @list = grep { -e $_->{EXEC} } @list; } -my @raw_list = sort keys %dm; -my @list = $::expert ? @raw_list : (grep { -e $dm{$_}->[1] } @raw_list) or @raw_list; +my $dm_name = basename(readlink("/etc/systemd/system/display-manager.service")) =~ s/(.*)\.service/$1/r; +my $dm = (find { basename($_->{EXEC}) eq $dm_name } @list) || $list[0]; start: if ($in->ask_from(N("Choosing a display manager"), @@ -60,21 +61,28 @@ several different X sessions on your local machine at the same time.")), list => \@list, val => \$dm, type => 'list', - format => sub { $dm{$_[0]}[0] }, - sort => 1, + format => sub { translate($_[0]{DESCRIPTION}) }, } ] ) + && $dm ) { - ! -x $dm{$dm}[1] and do { $in->do_pkgs->ensure_is_installed($dm{$dm}[2], $dm{$dm}[1]) or goto start }; - substInFile { - s/^(DISPLAYMANAGER)=.*(\n|)//; - s/^\n//g; - $_ .= "\nDISPLAYMANAGER=$dm\n" if eof; - } $cfg_file; - log::explanations("Switching to \"$dm\" display manager"); - if (any::running_window_manager()) { - $in->ask_okcancel('', N("The change is done, do you want to restart the dm service ?"), 1) and services::restart("dm"); + $in->do_pkgs->ensure_is_installed($dm->{PACKAGE}, $dm->{EXEC}) or goto start; + $dm_name = basename($dm->{EXEC}); + addVarsInSh($cfg_file, { DISPLAYMANAGER => $dm_name }); + symlinkf("/usr/lib/systemd/system/$dm_name.service", "$::prefix/etc/systemd/system/display-manager.service"); + log::explanations(qq(Switching to "$dm_name" display manager)); + # martinw: I can't find a way to get a clean switch between display managers when one is running. + # But keep the old code (to preserve the translations) in case someone else can. + my $can_switch_cleanly = 0; + if ($can_switch_cleanly && any::running_window_manager()) { + $in->ask_yesorno('', N("The change is done, do you want to restart the dm service?"), 1) and + $in->ask_yesorno('', N("You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service?"), 1) and + run_program::raw({ detach => 1 }, 'systemctl', 'restart', 'display-manager.service', '>', '/dev/null', '2>', '/dev/null'); + } elsif (any::running_window_manager()) { + $in->ask_warn('', N("The change is done and will take effect when you next boot the system")); + } else { + run_program::run('systemctl', 'daemon-reload'); } } |