From 597396c0f036a9cf423f2cbf7ef17bbb89ded242 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 5 Mar 2008 20:25:45 +0000
Subject: improve support for virtual interfaces

---
 lib/network/connection/ethernet.pm | 5 ++++-
 lib/network/tools.pm               | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index c99f805..1381f1a 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -22,7 +22,10 @@ sub get_devices() {
 sub get_unlisted_devices {
     my ($interfaces, $listed_devices) = @_;
     my @unlisted_interfaces = sort(difference2($interfaces, [ map { device_to_interface($_) } @$listed_devices ]));
-    map { interface_to_device($_) || +{ description => $_, interface => $_ } } @unlisted_interfaces;
+    map { interface_to_device($_) || +{
+       description => $_ =~ /:\d+$/ ? N("Virtual interface") : $_,
+       interface => $_ },
+    } @unlisted_interfaces;
 }
 
 sub handles_ifcfg {
diff --git a/lib/network/tools.pm b/lib/network/tools.pm
index a65fd7c..0db6b26 100644
--- a/lib/network/tools.pm
+++ b/lib/network/tools.pm
@@ -160,6 +160,7 @@ sub get_default_gateway_interface {
 
 sub get_interface_status {
     my ($intf) = @_;
+    $intf =~ s/:\d+$//;
     my $routes = get_routes();
     return $routes->{$intf}{network}, $routes->{$intf}{network} eq '0.0.0.0' && $routes->{$intf}{gateway};
 }
-- 
cgit v1.2.1