summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-06 11:29:40 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-06 11:29:40 +0100
commit7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0 (patch)
tree07ed424856878393fa9b3cf46c6b41c3a17b4798 /perl-install/install
parent0cb50ec11165e41dae65bcb62d85129eb6cd4c31 (diff)
downloaddrakx-7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0.tar
drakx-7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0.tar.gz
drakx-7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0.tar.bz2
drakx-7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0.tar.xz
drakx-7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0.zip
fix retrieving network info from stage2 after dracut migration (mga#11504)
dracut is now creating /tmp/ifcfg & /tmp/ifcfg-leases directories...
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c0dd77dd1..42c4cfe47 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix retrieving network info from stage2 after dracut migration (mga#11504)
+
Version 16.7 - 5 December 2013
- partitioning:
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index f6e30e8d8..661f3d4a8 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -415,7 +415,7 @@ sub read_stage1_net_conf() {
#- get stage1 network configuration if any.
log::l('found /tmp/network');
add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network'));
- if (my ($file) = glob_('/tmp/ifcfg-*')) {
+ if (my ($file) = grep { -f $_ } glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
my $l = network::network::read_interface_conf($file);
$o->{net}{ifcfg}{$l->{DEVICE}} ||= $l;