From c54495aa9155ed0e423d50f79ab95ad997668328 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Mar 2003 11:10:51 +0000
Subject: this is perl, not python ;p

---
 perl-install/network/isdn.pm    | 7 ++-----
 perl-install/network/network.pm | 2 +-
 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');
-- 
cgit v1.2.1