From 04a32a7f6b48a977c768d62a1c28f00958e0c9df Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 24 Feb 2003 07:36:00 +0000
Subject: - clean up embedding; since socket get automatically destroyed on
 child exit   and since they emit plug-removed at that moment, it's just
 cleaner to   centralize/consolidate the child exit in mcc   this of course,
 need a newer up-to-date mcc   what's more, it allows to remove the somewhat
 mythical   "$::isEmbedded and kill 'USR1', $::CCPID;" - drakautoinst,
 drakxservices, keyboardrake: fix fscking embedding managment

---
 perl-install/standalone/XFdrake       | 5 +----
 perl-install/standalone/drakTermServ  | 1 -
 perl-install/standalone/drakautoinst  | 3 +--
 perl-install/standalone/drakboot      | 4 +---
 perl-install/standalone/drakfont      | 1 -
 perl-install/standalone/drakxservices | 4 +---
 perl-install/standalone/keyboarddrake | 6 ------
 7 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 44f0e28d2..b8a905b75 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -59,10 +59,7 @@ begin:
     };
     $rc && $rc eq 'config_changed' and ask_for_X_restart($in);
 
-    $in->exit(0) if !$::isEmbedded;
-
-    kill 'USR1', $::CCPID;
-    goto begin;
+    $in->exit(0);
 }
 
 sub check_XFree {
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index f39c2c3b9..fb98bf47a 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -304,7 +304,6 @@ sub interactive_mode {
 								  }),
 								  gtksignal_connect(new Gtk2::Button(N("Close")), clicked => sub {
 								      write_conf_file();
-								      $::isEmbedded and kill 'USR1', $::CCPID;
 								      Gtk2->main_quit();
 								  }),
 								  ),
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index fe670be62..540a2fb82 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -241,8 +241,7 @@ quit_global($in, 0);
 
 sub quit_global {
     my ($in, $exitcode) = @_;
-    $::isEmbedded ? kill 'USR1', $::CCPID : $in->exit($exitcode);
-    goto begin;
+    $in->exit($exitcode);
 }
 
 
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 5abdff7f3..0e0765b9b 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -23,9 +23,7 @@ if ($in->isa('interactive::gtk')) {
     lilo_choice();
 }
 
-!$::isEmbedded and $in->exit(0);
-kill('USR1', $::CCPID);
-goto ask;
+$in->exit(0);
 
 sub lilo_choice {
     my $bootloader = bootloader::read(); 
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 4200b0b7b..faf4b4bdb 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -600,7 +600,6 @@ sub interactive_mode {
 						      gtksignal_connect(new Gtk2::Button(N("About")), clicked => sub { help() }),
 						      gtksignal_connect(new Gtk2::Button(N("Close")),
 									clicked => sub {
-									    $::isEmbedded and kill 'USR1', $::CCPID;
 									    Gtk2->main_quit();
 									}),
 						     ),
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 348331fe4..bb6dea16d 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -14,6 +14,4 @@ my $in = 'interactive'->vnew('su', 'services');
 begin:
 my $l = services::ask($in);
 services::doit($in, $l) if $l;
-!$::isEmbedded and $in->exit(0);
-kill 'USR1', $::CCPID;
-goto begin;
+$in->exit(0);
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 004689b3f..081ddc5b2 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -49,10 +49,4 @@ keyboard::write($keyboard);
 system('/etc/init.d/keytable', 'restart');
 
 end:
-if ($::isEmbedded) {
-    kill('USR1', $::CCPID);
-    $keyboard = '';
-    goto begin;
-} else {
     $in->exit(0) if $in;
-}
-- 
cgit v1.2.1