summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-30 15:02:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-30 15:02:42 +0000
commit4b04d5db1b78e2a68a5db20154e437ce85ab638c (patch)
tree3e94bb8a26a0a046ab769514ee6ec029e4a228b0
parent6b496f916ed6ddd708dcc673dafda99aec49f0c3 (diff)
downloaddrakx-backup-do-not-use-4b04d5db1b78e2a68a5db20154e437ce85ab638c.tar
drakx-backup-do-not-use-4b04d5db1b78e2a68a5db20154e437ce85ab638c.tar.gz
drakx-backup-do-not-use-4b04d5db1b78e2a68a5db20154e437ce85ab638c.tar.bz2
drakx-backup-do-not-use-4b04d5db1b78e2a68a5db20154e437ce85ab638c.tar.xz
drakx-backup-do-not-use-4b04d5db1b78e2a68a5db20154e437ce85ab638c.zip
fix crash on module lookup when ifcfg-<intf> file is missing on disk
(not yet configured interface case)
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index eebd1b4b2..aedb1743a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -670,7 +670,7 @@ If you don't know, choose 'use pppoe'"),
if (!exists $adsl_devices{$ntf_name} && member($adsl_type, qw(manual dhcp))) {
$auto_ip = $adsl_type eq 'dchp';
$find_lan_module->();
- $ethntf = $intf->{$ntf_name};
+ $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name };
return 'lan_intf';
}
network::adsl::adsl_probe_info($netcnx, $netc, $adsl_type, $ntf_name);
@@ -727,7 +727,7 @@ You can find a driver on http://eciadsl.flashtux.org/"),
allow_empty_list => 1, format => sub { $eth_intf{$_[0]} } } ];
},
post => sub {
- $ethntf = $intf->{$ntf_name};
+ $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name };
$::isInstall && $netc->{NET_DEVICE} eq $ethntf->{DEVICE} ? 'lan_alrd_cfg' : 'lan_protocol';
},
},