diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-02-18 17:35:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-02-18 17:35:17 +0000 |
| commit | 3ce35b6a36bd75410c11af5e804a08f7d5650aa8 (patch) | |
| tree | 5ae179989ea0f261fd5d91cb822fe6a452617f59 /perl-install/diskdrake | |
| parent | aa6398654727a7ebc408f50520fe6ae3266ae27b (diff) | |
| download | drakx-3ce35b6a36bd75410c11af5e804a08f7d5650aa8.tar drakx-3ce35b6a36bd75410c11af5e804a08f7d5650aa8.tar.gz drakx-3ce35b6a36bd75410c11af5e804a08f7d5650aa8.tar.bz2 drakx-3ce35b6a36bd75410c11af5e804a08f7d5650aa8.tar.xz drakx-3ce35b6a36bd75410c11af5e804a08f7d5650aa8.zip | |
factorize code in ask_window_manager_to_logout_then_do()
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index b5faef5cb..efe38a135 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -1282,21 +1282,7 @@ sub tell_wm_and_reboot() { if (!$wm) { system('reboot'); } else { - if (fork()) { - any::ask_window_manager_to_logout($wm); - return; - } - - open STDIN, "</dev/zero"; - open STDOUT, ">/dev/null"; - open STDERR, ">&STDERR"; - c::setsid(); - exec 'perl', '-e', q( - my ($wm, $pid) = @ARGV; - my $nb; - for ($nb = 20; $nb && -e "/proc/$pid"; $nb--) { sleep 1 } - exec 'reboot' if $nb; - ), $wm, $pid; + any::ask_window_manager_to_logout_then_do($wm, $pid, 'reboot'); } } |