diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-29 19:25:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-29 19:25:36 +0000 |
| commit | 0b88c22555f88c1a72395dd39d0e71e001d6ea57 (patch) | |
| tree | 4d5edc438d22ad1524b91fbd70f330e4d0727347 | |
| parent | 74c79d68b2b44241f8f59ee5ef806eec985347a7 (diff) | |
| download | drakx-backup-do-not-use-0b88c22555f88c1a72395dd39d0e71e001d6ea57.tar drakx-backup-do-not-use-0b88c22555f88c1a72395dd39d0e71e001d6ea57.tar.gz drakx-backup-do-not-use-0b88c22555f88c1a72395dd39d0e71e001d6ea57.tar.bz2 drakx-backup-do-not-use-0b88c22555f88c1a72395dd39d0e71e001d6ea57.tar.xz drakx-backup-do-not-use-0b88c22555f88c1a72395dd39d0e71e001d6ea57.zip | |
(ask_for_X_restart): make it work
| -rwxr-xr-x | perl-install/standalone/XFdrake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index dff5e5f64..635fd0324 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -132,7 +132,7 @@ sub ask_for_X_restart { $in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst (lc $wm)), 1) or return; - fork and $in->exit; + fork and return; any::ask_window_manager_to_logout($wm); open STDIN, "</dev/zero"; @@ -140,8 +140,9 @@ sub ask_for_X_restart { open STDERR, ">&STDERR"; c::setsid(); exec qw(perl -e), q{ - my ($wm, $pid) = @_; - for (my $nb = 30; $nb && -e "/proc/$pid"; $nb--) { sleep 1 } + my ($wm, $pid) = @ARGV; + my $nb; + for ($nb = 30; $nb && -e "/proc/$pid"; $nb--) { sleep 1 } system("killall X ; killall -15 xdm gdm kdm prefdm") if $nb; }, $wm, $pid; } |