diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2003-09-15 14:03:14 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2003-09-15 14:03:14 +0000 |
commit | 1d34fbffe86a397e1160689c0ab04023eb78e053 (patch) | |
tree | 574fe0e88489a6c27140600a9c0dd3c2a8af30af /perl-install | |
parent | 07f3419c9f8471f82537204523583e21adc721ee (diff) | |
download | drakx-backup-do-not-use-1d34fbffe86a397e1160689c0ab04023eb78e053.tar drakx-backup-do-not-use-1d34fbffe86a397e1160689c0ab04023eb78e053.tar.gz drakx-backup-do-not-use-1d34fbffe86a397e1160689c0ab04023eb78e053.tar.bz2 drakx-backup-do-not-use-1d34fbffe86a397e1160689c0ab04023eb78e053.tar.xz drakx-backup-do-not-use-1d34fbffe86a397e1160689c0ab04023eb78e053.zip |
- call any::ask_window_manager_to_logout() after forking so that exit doesn't happen before it is done
(otherwise it can loose Xauth access)
- fix checking config_changed (it can be string 'config_changed' or the new $raw_X)
Diffstat (limited to 'perl-install')
-rwxr-xr-x | perl-install/standalone/XFdrake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 6b0adb4aa..6f88662cd 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -57,7 +57,7 @@ $configure_this ||= 'everything'; Xconfig::main::configure_resolution($in, Xconfig::xfree->read); } }; - $rc && $rc eq 'config_changed' and ask_for_X_restart($in); + ask_for_X_restart($in) if $rc; $in->exit(0); } @@ -92,8 +92,10 @@ sub ask_for_X_restart { $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return; - fork() and return; - any::ask_window_manager_to_logout($wm); + if (fork()) { + any::ask_window_manager_to_logout($wm); + return; + } open STDIN, "</dev/zero"; open STDOUT, ">/dev/null"; |