diff options
| author | Daouda Lo <daouda@mandriva.com> | 2002-09-18 14:42:59 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2002-09-18 14:42:59 +0000 |
| commit | 3733b8882033e7c7972c1740d6a85161ae65da7e (patch) | |
| tree | af0fb3ed94cb5a4f9d997eb2d04c8bca90aff55f | |
| parent | f98575020df59c38c7999b37743525107f2fea31 (diff) | |
| download | control-center-3733b8882033e7c7972c1740d6a85161ae65da7e.tar control-center-3733b8882033e7c7972c1740d6a85161ae65da7e.tar.gz control-center-3733b8882033e7c7972c1740d6a85161ae65da7e.tar.bz2 control-center-3733b8882033e7c7972c1740d6a85161ae65da7e.tar.xz control-center-3733b8882033e7c7972c1740d6a85161ae65da7e.zip | |
- kill logdrake after exiting mcc aka ts.
| -rwxr-xr-x | control-center | 12 | ||||
| -rw-r--r-- | drakconf.spec | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/control-center b/control-center index c40a92f6..084ddd7c 100755 --- a/control-center +++ b/control-center @@ -49,7 +49,6 @@ my ($_version, $conffile, $class_install) = ("9.0", "/etc/mcc.conf","/etc/syscon #we'll show log only once and don't restart it with new embedded process my $show_log = 1; -my $logdrake_already_run = 0; my $still_in_splash_screen = 1; my %h = getVarsFromSh($conffile); @@ -621,14 +620,19 @@ sub compute_exec_string { } } } - if ($logs && $show_log && !$logdrake_already_run) { + if ($logs && $show_log) { + my $pid; gtkadd($exp_frame, my $exp_socket = new Gtk::Socket); - $logdrake_already_run = 1; $exp_socket->realize; 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, 1); +# fork_($exec_log, 1); + unless ($pid = fork) { + splash_warning(_("cannot fork: %s", $~)) unless defined $pid; + exec($exec_log); + } + push @pid_exp, $pid; } } diff --git a/drakconf.spec b/drakconf.spec index 05665ba8..44f1694c 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -5,7 +5,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: %version -Release: 4mdk +Release: 5mdk # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %name-%version.tar.bz2 @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %_datadir/mcc/themes/kde %changelog +* Wed Sep 18 2002 Daouda LO <daouda@mandrakesoft.com> 9.0-5mdk +- kill logdrake after exiting mcc aka ts. + * Wed Sep 18 2002 Daouda LO <daouda@mandrakesoft.com> 9.0-4mdk - non embedded apps (for instance rpmdrake) should not quit when switching section in mcc. |