summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-03-05 11:10:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-03-05 11:10:51 +0000
commitc54495aa9155ed0e423d50f79ab95ad997668328 (patch)
tree2c2c1af366a8bfcafe18e50e1849e6cf0af788cd
parentc9204b92a05481ff900c9f7ed03b0a04815dc23c (diff)
downloaddrakx-backup-do-not-use-c54495aa9155ed0e423d50f79ab95ad997668328.tar
drakx-backup-do-not-use-c54495aa9155ed0e423d50f79ab95ad997668328.tar.gz
drakx-backup-do-not-use-c54495aa9155ed0e423d50f79ab95ad997668328.tar.bz2
drakx-backup-do-not-use-c54495aa9155ed0e423d50f79ab95ad997668328.tar.xz
drakx-backup-do-not-use-c54495aa9155ed0e423d50f79ab95ad997668328.zip
this is perl, not python ;p
-rw-r--r--perl-install/network/isdn.pm7
-rw-r--r--perl-install/network/network.pm2
2 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 3bb656894..1408e1587 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -41,11 +41,8 @@ We recommand the light configuration.
$netc->{isdntype} = 'isdn_internal';
$netcnx->{isdn_internal} = isdn_read_config($isdn);
$netcnx->{isdn_internal}{$_} = $netc->{autodetect}{isdn}{$_} foreach 'description', 'vendor', 'id', 'driver', 'card_type', 'type', 'is_light';
- if (defined $netc->{autodetect}{isdn}{id}) {
- $netcnx->{isdn_internal}{is_light} = 1;
- } else {
- $netcnx->{isdn_internal}{is_light} = $netc->{autodetect}{isdn}{is_light};
- }
+ $netcnx->{isdn_internal}{is_light} =
+ defined $netc->{autodetect}{isdn}{id} ? 1 : $netc->{autodetect}{isdn}{is_light};
isdn_detect($netcnx->{isdn_internal}, $netc) or return;
} else {
$netc->{isdntype} = 'isdn_external';
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 13aa34dcf..b17b102d9 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -543,7 +543,7 @@ sub configureNetwork2 {
write_conf("$etc/sysconfig/network", $netc);
write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP};
write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $prefix) foreach grep { $_->{DEVICE} } values %$intf;
- add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } values %$intf) if $netc->{HOSTNAME} and ! $netc->{DHCP};
+ add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } values %$intf) if $netc->{HOSTNAME} && !$netc->{DHCP};
add2hosts("$etc/hosts", "localhost", "127.0.0.1");
any { $_->{BOOTPROTO} eq "dhcp" } values %$intf and $in->do_pkgs->install($netc->{dhcp_client} || 'dhcp-client');