diff options
| author | Arnaud Desmons <adesmons@mandriva.com> | 2002-12-02 17:07:29 +0000 |
|---|---|---|
| committer | Arnaud Desmons <adesmons@mandriva.com> | 2002-12-02 17:07:29 +0000 |
| commit | 9a9961b6cf1ad884564dc3dca7e7e8447f2321e0 (patch) | |
| tree | 7b66a49543bc0ba1266310e425db08d2e60a4f56 /perl-install/network/network.pm | |
| parent | 0579c9250c7dfd98c0c47174fe000695921b39fb (diff) | |
| download | drakx-9a9961b6cf1ad884564dc3dca7e7e8447f2321e0.tar drakx-9a9961b6cf1ad884564dc3dca7e7e8447f2321e0.tar.gz drakx-9a9961b6cf1ad884564dc3dca7e7e8447f2321e0.tar.bz2 drakx-9a9961b6cf1ad884564dc3dca7e7e8447f2321e0.tar.xz drakx-9a9961b6cf1ad884564dc3dca7e7e8447f2321e0.zip | |
Some data are now fetched from system instead of drakconnect conf file (adsl, ppp, ifcfg-eth)
Diffstat (limited to 'perl-install/network/network.pm')
| -rw-r--r-- | perl-install/network/network.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 35882507f..14a4fdaf3 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -114,7 +114,7 @@ sub write_resolv_conf { @new, @old; }; output($file, @search, @nameserver, (map { "# $_\n" } @unknown), "\n# ppp temp entry\n"); - + #-res_init(); # reinit the resolver so DNS changes take affect 1; } else { @@ -417,7 +417,7 @@ sub read_all_conf { add2hash($netc, read_conf("$prefix/etc/sysconfig/network")) if -r "$prefix/etc/sysconfig/network"; add2hash($netc, read_resolv_conf("$prefix/etc/resolv.conf")) if -r "$prefix/etc/resolv.conf"; foreach (all("$prefix/etc/sysconfig/network-scripts")) { - if (/ifcfg-(\w+)/ && $1 ne 'lo' && $1 !~ /ppp/) { + if (/ifcfg-(\w+)/ && $1 ne 'lo') { my $intf = findIntf($intf, $1); add2hash($intf, { getVarsFromSh("$prefix/etc/sysconfig/network-scripts/$_") }); } |