summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/network.pm6
-rw-r--r--perl-install/network/smb.pm2
-rw-r--r--perl-install/network/tools.pm4
3 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 79884887a..1594aba32 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -133,12 +133,12 @@ sub write_interface_conf {
if ($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/ }
$hwaddr and $intf->{HWADDR} = undef;
add2hash($intf, {
- BROADCAST => join('.', mapn { int $_[0] | ~int $_[1] & 255 } \@ip, \@mask),
- NETWORK => join('.', mapn { int $_[0] & $_[1] } \@ip, \@mask),
+ BROADCAST => join('.', mapn { int($_[0]) | ((~int($_[1])) & 255) } \@ip, \@mask),
+ NETWORK => join('.', mapn { int($_[0]) & $_[1] } \@ip, \@mask),
ONBOOT => bool2yesno(!member($intf->{DEVICE}, map { $_->{device} } detect_devices::probeall())),
if_($::o->{miscellaneous}{track_network_id}, HWADDR => $hwaddr)
});
- setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR), ($intf->{wireless_eth}) ? qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV) : ());
+ setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR), $intf->{wireless_eth} ? qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV) : ());
}
sub add2hosts {
diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index d1f2128bf..06bd70609 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -92,7 +92,7 @@ sub find_exports {
s/^\t//;
/NT_STATUS_/ and die $_;
my ($name, $type, $comment) = unpack "A15 A10 A*", $_;
- if ($name eq '---------' && $type eq '----' && $comment eq '-------' .. /^$/) {
+ if (($name eq '---------' && $type eq '----' && $comment eq '-------') .. /^$/) {
push @l, { name => $name, type => $type, comment => $comment, server => $server }
if $type eq 'Disk' && $name !~ /\$$/ && $name !~ /NETLOGON|SYSVOL/;
}
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 88cacba9d..53dc1b5ff 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -53,8 +53,8 @@ sub ask_connect_now {
my $netc = {};
$up = connected();
}
- my $m = $up ? (N("The system is now connected to Internet.") .
- if_($::isInstall, N("For security reason, it will be disconnected now."))) :
+ my $m = $up ? N("The system is now connected to Internet.") .
+ if_($::isInstall, N("For security reason, it will be disconnected now.")) :
N("The system doesn't seem to be connected to internet.
Try to reconfigure your connection.");
if ($::isWizard) {