From f0f54fec1e8a3c7b8e24be3de3dc12deac4998dc Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 7 Jul 2005 07:01:26 +0000
Subject: remove connect/diconnect_backend add start/stop_net_interface add
 detach parameter to start/stop_interface

---
 perl-install/standalone/drakconnect | 4 ++--
 perl-install/standalone/net_applet  | 9 +++++----
 perl-install/standalone/net_monitor | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 3b8393265..20f9638b2 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -94,9 +94,9 @@ my $int_connect = Gtk2::Button->new(N("Wait please"));
 $int_connect->set_sensitive(0);
 $int_connect->signal_connect(clicked => sub {
     if (!$isconnected) {
-        network::tools::start_interface($net->{net_interface});
+        network::tools::start_net_interface($net, 1);
     } else {
-        network::tools::stop_interface($net->{net_interface});
+        network::tools::stop_net_interface($net, 1);
     }
 });
 
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index d8e72394e..03b5cba10 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -63,8 +63,8 @@ Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a ne
 	    );
 
 my %actions = (
-               'upNetwork' => { name => sub { N("Connect %s", $_[0]) }, launch => \&network::tools::start_interface },
-               'downNetwork' => { name => sub { N("Disconnect %s", $_[0]) }, launch => \&network::tools::stop_interface },
+               'upNetwork' => { name => sub { N("Connect %s", $_[0]) }, launch => sub { network::tools::start_interface($_[0], 1) } },
+               'downNetwork' => { name => sub { N("Disconnect %s", $_[0]) }, launch => sub { network::tools::stop_interface($_[0], 1) } },
                'monitorNetwork' => { name => N("Monitor Network"), launch => sub { system("/usr/sbin/net_monitor --defaultintf $_[0] &") } },
                'wireless' => { name => N("Manage wireless networks"), launch => sub { system("/usr/sbin/drakroam &") } },
                'confNetwork' => { name => N("Configure Network"), launch => sub { system("/usr/sbin/drakconnect --skip-wizard &") } },
@@ -82,8 +82,9 @@ my %actions = (
                    choices => sub { network::network::netprofile_list() },
                    choice_selected => sub { $_[0] eq $net->{PROFILE} },
                    launch => sub {
-                       $net->{PROFILE} = $_[0];
-                       network::tools::bg_command_as_root('/sbin/set-netprofile', $net->{PROFILE});
+		       require run_program;
+		       $net->{PROFILE} = $_[0];
+		       run_program::raw({ detach => 1 }, network::tools::wrap_command_for_root('/sbin/set-netprofile', $net->{PROFILE}));
                    }
                },
 	       'refresh' => { name => N("Refresh"), launch => sub { checkNetworkForce() } },
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index e72e8e53a..1bef0f4d5 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -47,8 +47,8 @@ network::network::read_net_conf($net);
 $default_intf ||= $net->{default}{interface};
 
 if ($force) {
-    $connect and network::tools::start_interface($default_intf);
-    $disconnect and network::tools::stop_interface($default_intf);
+    $connect and network::tools::start_interface($default_intf, 1);
+    $disconnect and network::tools::stop_interface($default_intf, 1);
     $connect = $disconnect = 0;
 }
 $quiet and exit(0);
@@ -251,8 +251,8 @@ sub connection() {
 
     $tool_pid = 
       $wasconnected == 1 
-	? network::tools::stop_interface($default_intf)
-        : network::tools::start_interface($default_intf);
+	? network::tools::stop_interface($default_intf, 1)
+        : network::tools::start_interface($default_intf, 1);
 }
 
 sub graph_window_width() { $width - $left_border }
-- 
cgit v1.2.1