summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-03-25 18:09:32 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-03-25 18:09:32 +0000
commita8d02597ab6b21dd6116d77ae4255e2e86715c0e (patch)
tree2bc72cbb86396af4a1a9ed68c67673b5eaf47597
parentb9737634612a2590cfe70dcca29ac3b64b33355d (diff)
downloaddrakx-a8d02597ab6b21dd6116d77ae4255e2e86715c0e.tar
drakx-a8d02597ab6b21dd6116d77ae4255e2e86715c0e.tar.gz
drakx-a8d02597ab6b21dd6116d77ae4255e2e86715c0e.tar.bz2
drakx-a8d02597ab6b21dd6116d77ae4255e2e86715c0e.tar.xz
drakx-a8d02597ab6b21dd6116d77ae4255e2e86715c0e.zip
Changed X server restart routing not to rely on ctrl-alt-del (#49059).
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm13
2 files changed, 9 insertions, 6 deletions
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 {