From a8d02597ab6b21dd6116d77ae4255e2e86715c0e Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Wed, 25 Mar 2009 18:09:32 +0000
Subject: Changed X server restart routing not to rely on ctrl-alt-del
 (#49059).

---
 perl-install/NEWS   |  2 ++
 perl-install/any.pm | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5e612a891..78ffb834e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- changed X server restart routing not to rely on ctrl-alt-del (#49059).
+
 Version 12.18 - 25 March 2009
 
 - add new Entry infrastructure for rpmdrake
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 31433594b..9b2730c0f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1377,13 +1377,14 @@ sub ask_for_X_restart {
     my ($wm, $pid) = running_window_manager();
 
     if (!$wm) {
-    	$in->ask_warn('', N("Please log out and then use Ctrl-Alt-BackSpace"));
-	return;
+        # no window manager, ctrl-alt-del may not be supported, but we still have to restart X..
+        $in->ask_okcancel('', N("You need to logout and back in again for changes to take effect. Press OK to logout now."), 1) or return;
+        system('killall X');
+    }
+    else {
+        $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return;
+        ask_window_manager_to_logout_then_do($wm, $pid, 'killall X');
     }
-
-    $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return;
-
-    ask_window_manager_to_logout_then_do($wm, $pid, 'killall X');
 }
 
 sub alloc_raw_device {
-- 
cgit v1.2.1