diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-09-22 13:38:05 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-09-22 13:38:05 +0000 |
| commit | ca2411e3672fd7fe1e1fa72579970efb35296498 (patch) | |
| tree | d205603eb98c4e4e22b2b4d69889495cf9180ef3 | |
| parent | ce1facdc80028ba33981ccb9491c0fbd8d7fd53f (diff) | |
| download | drakx-backup-do-not-use-ca2411e3672fd7fe1e1fa72579970efb35296498.tar drakx-backup-do-not-use-ca2411e3672fd7fe1e1fa72579970efb35296498.tar.gz drakx-backup-do-not-use-ca2411e3672fd7fe1e1fa72579970efb35296498.tar.bz2 drakx-backup-do-not-use-ca2411e3672fd7fe1e1fa72579970efb35296498.tar.xz drakx-backup-do-not-use-ca2411e3672fd7fe1e1fa72579970efb35296498.zip | |
fixed strange perl writing sense less...
| -rw-r--r-- | perl-install/network/network.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 24a256855..91eb28ea9 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -338,8 +338,8 @@ notation (for example, 1.2.3.4)."); my $auto_ip = $intf->{BOOTPROTO} !~ /static/; my $onboot = $intf->{ONBOOT} ? $intf->{ONBOOT} =~ /yes/ : bool2yesno(!member($intf->{DEVICE}, map { $_->{device} } detect_devices::pcmcia_probe())); my $needhostname = $intf->{NEEDHOSTNAME} !~ /no/; - my $hotplug = $::isStandalone && !$intf->{MII_NOT_SUPPORTED} or 1; - my $track_network_id = $::isStandalone && $intf->{HWADDR} or detect_devices::isLaptop(); + my $hotplug = $::isStandalone && !$intf->{MII_NOT_SUPPORTED} || 1; + my $track_network_id = $::isStandalone && $intf->{HWADDR} || detect_devices::isLaptop(); delete $intf->{NETWORK}; delete $intf->{BROADCAST}; my @fields = qw(IPADDR NETMASK); @@ -550,7 +550,7 @@ sub easy_dhcp { sub configureNetwork2 { my ($in, $prefix, $netc, $intf) = @_; my $etc = "$prefix/etc"; - + $netc->{wireless_eth} and $in->do_pkgs->install(qw(wireless-tools)); write_conf("$etc/sysconfig/network", $netc); write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP}; |