From bc62bd515fce6f9faca5955d1cd4fb41664133f1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 12 May 2008 12:20:52 +0000
Subject: allow to skip protocol and address configuration (defaulting to dhcp)
 if AUTOMATIC_ADDRESS is true in /etc/sysconfig/drakx-net

---
 lib/network/connection/ethernet.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/network/connection/ethernet.pm')

diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index 81592e1..bdc371e 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -63,8 +63,10 @@ sub check_device {
 }
 
 sub get_protocols() {
-    {
-        static => N("Manual configuration"),
+    my $system_file = '/etc/sysconfig/drakx-net';
+    my %global_settings = getVarsFromSh($system_file);
+    +{
+        if_(!text2bool($global_settings{AUTOMATIC_ADDRESS}), static => N("Manual configuration")),
         dhcp   => N("Automatic IP (BOOTP/DHCP)"),
     };
 }
-- 
cgit v1.2.1