From 74084f09177bcabe7981c8f04639d1d44431704c Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 2 May 2000 15:42:59 +0000
Subject: *** empty log message ***

---
 perl-install/install2.pm                  | 2 +-
 perl-install/install_steps_interactive.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d8bd61b9c..c4ba511b4 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -405,7 +405,7 @@ sub configureNetwork {
 	add2hash($o->{netc}, network::read_conf("$o->{prefix}/etc/sysconfig/network")) if -r "$o->{prefix}/etc/sysconfig/network";
 	add2hash($o->{netc}, network::read_resolv_conf("$o->{prefix}/etc/resolv.conf")) if -r "$o->{prefix}/etc/resolv.conf";
 	foreach (all("$o->{prefix}/etc/sysconfig/network-scripts")) {
-	    if (/ifcfg-(\w+)/ && $1 !~ /^ppp/) {
+	    if (/ifcfg-(\w+)/ && $1 ne 'lo' && $1 !~ /^ppp/) {
 		my $intf = network::findIntf($o->{intf}, $1);
 		add2hash($intf, { getVarsFromSh("$o->{prefix}/etc/sysconfig/network-scripts/$_") });
 	    }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f35ab94a4..d170dd31b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -388,7 +388,7 @@ sub afterInstallPackages($) {
 sub configureNetwork($) {
     my ($o, $first_time) = @_;
     local $_;
-    if ($o->{intf} && $first_time) {
+    if (@{$o->{intf}} > 0 && $first_time) {
 	my @l = (
 		 __("Keep the current IP configuration"),
 		 __("Reconfigure network now"),
-- 
cgit v1.2.1