diff options
| author | damien <damien@mandriva.com> | 2001-03-06 03:06:35 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-03-06 03:06:35 +0000 |
| commit | cb058fe33615bb729abc2721b0f69976356f26f7 (patch) | |
| tree | 35b5f1486401196d3daade71b80b62ffafdfe9a0 | |
| parent | 6b2dfe5b978f10d4c47dbf3f386419a4624718ca (diff) | |
| download | drakx-backup-do-not-use-cb058fe33615bb729abc2721b0f69976356f26f7.tar drakx-backup-do-not-use-cb058fe33615bb729abc2721b0f69976356f26f7.tar.gz drakx-backup-do-not-use-cb058fe33615bb729abc2721b0f69976356f26f7.tar.bz2 drakx-backup-do-not-use-cb058fe33615bb729abc2721b0f69976356f26f7.tar.xz drakx-backup-do-not-use-cb058fe33615bb729abc2721b0f69976356f26f7.zip | |
corrected bad file search
| -rw-r--r-- | perl-install/install2.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 62d68d6b3..4df87e835 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -538,16 +538,18 @@ sub main { } $::o = $o = $o_; - if (-e "/tmp/network") { + if (-e '/tmp/network') { require network; #- get stage1 network configuration if any. - $o->{netc} ||= network::read_conf("/tmp/network"); + log::l('found /tmp/network'); + $o->{netc} ||= network::read_conf('/tmp/network'); if (my ($file) = glob_('/tmp/ifcfg-*')) { log::l("found network config file $file"); my $l = network::read_interface_conf($file); $o->{intf} ||= { $l->{DEVICE} => $l }; } - if (my ($file) = glob_('/etc/resolv.conf')) { + if (-e '/etc/resolv.conf') { + my $file ='/etc/resolv.conf'; log::l("found network config file $file"); add2hash($o->{netc}, network::read_resolv_conf($file)); } |