From eff4d1b6c9c65eae25f5fd01f3eaebe0828fc66a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 5 Mar 2003 16:32:38 +0000 Subject: fix userdrake embedding (look at comment) by disabling it for now --- control-center | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/control-center b/control-center index 02c0f681..cd2574df 100755 --- a/control-center +++ b/control-center @@ -96,6 +96,7 @@ $::isRpmDrake = -e "/usr/sbin/rpmdrake"; # { key => [ log_exp, binary, gtkplug?, description ] } # { key => [ log_exp, [ binary, win_nb ], gtkplug?, description ] } +# gtkplug meaning: -1 => not embedded, 0 => external x11 app, 1 => proper embedding my $exec_hash = { "Auto Install" => [ "drakautoinst", "$sbindir/drakautoinst", 1, N("DrakAutoInst helps you produce an Auto Install floppy") ], @@ -135,7 +136,12 @@ my $exec_hash = "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("DrakXServices helps you enable or disable services") ], "Software Sources Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("Software Sources Manager helps you define where software packages are downloaded from") ], "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("DrakxTV helps you set up your TV card") ], - "Users" => [ "userdrake", "$bindir/userdrake", 1, N("UserDrake helps you add, remove or change users of your system") ], + # userdrake intercept and ignore SIG_TERM, thus do not properly detach from mcc + # proper fix #1: userdrake do not ignore SIG_TERM when argv contains --embedded + # proper fix #2: wait for plug destruction that results from app + # killing or explicitely destroy it if needed + # instead of relying on app exit + "Users" => [ "userdrake", "$bindir/userdrake", 0, N("UserDrake helps you add, remove or change users of your system") ], "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("Set WebDAV mount points") ], }; -- cgit v1.2.1