From 4db98db63327456fbd64b0302eaacff7dd6820aa Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 17 Feb 2005 17:35:48 +0000
Subject: add get_default_device

---
 perl-install/network/shorewall.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 4b76f230a..2f15dbaa1 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -45,17 +45,22 @@ sub get_config_file {
     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix/etc/shorewall/$file");
 }
 
-sub get_net_device() {
+sub get_default_device() {
     my $netcnx = {};
     my $netc = {};
     my $intf = {};
     network::netconnect::read_net_conf($netcnx, $netc, $intf);
     my $default_intf = network::tools::get_default_gateway_interface($netc, $intf);
-    $default_intf->{DEVICE} =~ /^ippp/ && "ippp+" ||
-    $default_intf->{DEVICE} =~ /^ppp/ && "ppp+" ||
     $default_intf->{DEVICE};
 }
 
+sub get_net_device() {
+    my $default_dev = get_default_device();
+    $default_dev =~ /^ippp/ && "ippp+" ||
+    $default_dev =~ /^ppp/ && "ppp+" ||
+    $default_dev;
+}
+
 sub default_interfaces_silent {
 	my ($_in) = @_;
 	my %conf;
-- 
cgit v1.2.1