From c3f96765d1b067bbdc8353306ed5f5d1d8b77256 Mon Sep 17 00:00:00 2001
From: Florin Grad <florin@mandriva.com>
Date: Fri, 5 Sep 2003 14:28:30 +0000
Subject: small fixes for drakgw and drakfirewall

---
 perl-install/network/netconnect.pm | 10 ++++++----
 perl-install/network/network.pm    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e154db1fe..639e1ab6f 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -316,12 +316,14 @@ sub load_conf {
 sub get_net_device() {
     my $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up";
     my $network_file = "/etc/sysconfig/network";
-    if (cat_("$prefix$connect_file") =~ /network/) {
-	${{ getVarsFromSh("$prefix$network_file") }}{GATEWAYDEV};
+		if (cat_("$prefix$connect_file") =~ /ifup/) {
+  		if_(cat_($connect_file) =~ /^\s*ifup\s+(.*)/m, split(' ', $1))
+		} elsif (cat_("$prefix$connect_file") =~ /network/) {
+			${{ getVarsFromSh("$prefix$network_file") }}{GATEWAYDEV};
     } elsif (cat_("$prefix$connect_file") =~ /isdn/) {
-	"ippp+"; 
+			"ippp+"; 
     } else {
-	"ppp+";
+			"ppp+";
     };
 }
 
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 2b1f5c944..5f4e059e1 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -44,7 +44,7 @@ sub read_resolv_conf {
 
 sub read_interface_conf {
     my ($file) = @_;
-    my %intf = getVarsFromSh($file) or die "cannot open file $file: $!";
+    my %intf = getVarsFromSh($file);
 
     $intf{BOOTPROTO} ||= 'static';
     $intf{isPtp} = $intf{NETWORK} eq '255.255.255.255';
-- 
cgit v1.2.1