From 69cf8dea911b627e07125bd3f9787b77e99a0edf Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 25 Feb 2005 17:02:56 +0000
Subject: do not ask for root password if interface allows USERCTL

---
 perl-install/network/tools.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'perl-install/network/tools.pm')

diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 052b0d430..92fe5f1f6 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -73,14 +73,23 @@ sub bg_command_as_root {
     }
 }
 
+sub user_run_interface_command {
+    my ($command, $intf) = @_;
+    if (system("usernetctl $intf report") == 0) {
+        run_program::run("$command $intf &");
+    } else {
+        bg_command_as_root($command, $intf);
+    }
+}
+
 sub start_interface {
     my ($intf) = @_;
-    bg_command_as_root('/sbin/ifup', $intf);
+    user_run_interface_command('/sbin/ifup', $intf);
 }
 
 sub stop_interface {
     my ($intf) = @_;
-    bg_command_as_root('/sbin/ifdown', $intf);
+    user_run_interface_command('/sbin/ifdown', $intf);
 }
 
 sub connected() { gethostbyname("mandrakesoft.com") ? 1 : 0 }
-- 
cgit v1.2.1