summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Grad <florin@mandriva.com>2003-09-05 14:28:30 +0000
committerFlorin Grad <florin@mandriva.com>2003-09-05 14:28:30 +0000
commitc3f96765d1b067bbdc8353306ed5f5d1d8b77256 (patch)
tree2c06b84653461af60eba70139229c0ab5e5fcbe9
parent7205eb330a711bf3df70a0383e0ba8a9578871ec (diff)
downloaddrakx-backup-do-not-use-c3f96765d1b067bbdc8353306ed5f5d1d8b77256.tar
drakx-backup-do-not-use-c3f96765d1b067bbdc8353306ed5f5d1d8b77256.tar.gz
drakx-backup-do-not-use-c3f96765d1b067bbdc8353306ed5f5d1d8b77256.tar.bz2
drakx-backup-do-not-use-c3f96765d1b067bbdc8353306ed5f5d1d8b77256.tar.xz
drakx-backup-do-not-use-c3f96765d1b067bbdc8353306ed5f5d1d8b77256.zip
small fixes for drakgw and drakfirewall
-rw-r--r--perl-install/network/netconnect.pm10
-rw-r--r--perl-install/network/network.pm2
2 files changed, 7 insertions, 5 deletions
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';