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/standalone/XFdrake | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 2738057a6..47f138e47 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -95,19 +95,5 @@ 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;
 
-    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 = 30; $nb && -e "/proc/$pid"; $nb--) { sleep 1 }
-	system("killall X") if $nb;
-    ), $wm, $pid;
+    any::ask_window_manager_to_logout_then_do($wm, $pid, 'killall X');
 }
-- 
cgit v1.2.1