diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-02 15:42:59 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-02 15:42:59 +0000 |
| commit | 74084f09177bcabe7981c8f04639d1d44431704c (patch) | |
| tree | aa19d12fe0a706d013809dc638334f9ea392de2a | |
| parent | 494ffe2fc2f6a29aa74994ab53a53e3b074e67f6 (diff) | |
| download | drakx-backup-do-not-use-74084f09177bcabe7981c8f04639d1d44431704c.tar drakx-backup-do-not-use-74084f09177bcabe7981c8f04639d1d44431704c.tar.gz drakx-backup-do-not-use-74084f09177bcabe7981c8f04639d1d44431704c.tar.bz2 drakx-backup-do-not-use-74084f09177bcabe7981c8f04639d1d44431704c.tar.xz drakx-backup-do-not-use-74084f09177bcabe7981c8f04639d1d44431704c.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
2 files changed, 2 insertions, 2 deletions
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"), |