Adapt drakdm and set_autologin for display-manager service, not prefdm (mga#22593)

1 files changed, 14 insertions, 5 deletions

diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index a8be26875..6e7d42304 100755
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -47,8 +47,8 @@ if (!$::expert) {
     @list = grep { -e $_->{EXEC} } @list;
 }
 
-my ($dm_NAME) = cat_($cfg_file) =~ /^DISPLAYMANAGER=(.*)/m;
-my $dm = (find { uc($_->{NAME}) eq uc($dm_NAME) } @list) || $list[0];
+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"),
@@ -68,12 +68,21 @@ several different X sessions on your local machine at the same time.")),
       && $dm
    ) {
     $in->do_pkgs->ensure_is_installed($dm->{PACKAGE}, $dm->{EXEC}) or goto start;
-    addVarsInSh($cfg_file, { DISPLAYMANAGER => $dm->{NAME} });
-    log::explanations(qq(Switching to "$dm->{NAME}" display manager));
-    if (any::running_window_manager()) {
+    $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');
     }
 }