summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-09-13 09:13:13 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-09-13 09:13:13 +0000
commit32cefb4e278bbbfaec26f7aa71fad20f57391a86 (patch)
treefde75543d98c53f4d9ec4df912e70648e4aafff8
parentd5dbaea2c11c20db39010664bd282b9c3ed09c3c (diff)
downloadcontrol-center-32cefb4e278bbbfaec26f7aa71fad20f57391a86.tar
control-center-32cefb4e278bbbfaec26f7aa71fad20f57391a86.tar.gz
control-center-32cefb4e278bbbfaec26f7aa71fad20f57391a86.tar.bz2
control-center-32cefb4e278bbbfaec26f7aa71fad20f57391a86.tar.xz
control-center-32cefb4e278bbbfaec26f7aa71fad20f57391a86.zip
don't kill logdrake
-rwxr-xr-xcontrol-center5
1 files changed, 3 insertions, 2 deletions
diff --git a/control-center b/control-center
index 8ef5a4a9..51e00264 100755
--- a/control-center
+++ b/control-center
@@ -563,12 +563,13 @@ sub sig_usr2 {
}
sub fork_ {
- my ($prog) = @_;
+ my ($prog, $do_not_kill) = @_;
my $pid;
unless ($pid = fork) {
splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
exec($prog);
}
+ return if $do_not_kill;
push @pid_launched, $pid if ($embedded);
}
@@ -622,7 +623,7 @@ sub compute_exec_string {
my $exec_log = "logdrake --explain=$log_exp --embedded " . $exp_socket->window->XWINDOW . " " . $$;
$show_log = 0;
if ($exec =~ /(drakfont|drakconnect|drakboot)/) { $exp_frame->hide() } # $window_global->height < 600
- fork_($exec_log);
+ fork_($exec_log, 1);
}
}