From 3ce35b6a36bd75410c11af5e804a08f7d5650aa8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 18 Feb 2005 17:35:17 +0000
Subject: factorize code in ask_window_manager_to_logout_then_do()

---
 perl-install/diskdrake/interactive.pm | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'perl-install/diskdrake/interactive.pm')

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');
     }
 }
 
-- 
cgit v1.2.1