diff options
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 3 | ||||
| -rw-r--r-- | perl-install/network/network.pm | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index ce688e846..b0e5d3123 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -400,7 +400,7 @@ sub pppConfig { $modem or return; if ($modem->{device} ne "/dev/modem") { - symlinkf($modem->{device}, "$prefix/dev/modem") ? add_devfslink($prefix, "$prefix/dev/modem") : or log::l("creation of $prefix/dev/modem failed") + symlinkf($modem->{device}, "$prefix/dev/modem") ? add_devfslink($prefix, "$prefix/dev/modem") : log::l("creation of $prefix/dev/modem failed") } $in->do_pkgs->install('ppp') if !$::testing; diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 661c32291..106270a38 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -13,6 +13,7 @@ use run_program; use devices; use commands; use modules; +use any; use log; my @mouses_fields = qw(nbuttons MOUSETYPE XMOUSETYPE name); @@ -181,7 +182,7 @@ sub write { local $mouse->{XEMU3} = bool2yesno($mouse->{nbuttons} < 3); local $mouse->{WHEEL} = bool2yesno($mouse->{nbuttons} > 3); setVarsInSh("$prefix/etc/sysconfig/mouse", $mouse, qw(MOUSETYPE XMOUSETYPE FULLNAME XEMU3 WHEEL device)); - symlinkf $mouse->{device}, "$prefix/dev/mouse" ? add_devfslink($prefix, "$prefix/dev/mouse") : log::l("creating $prefix/dev/mouse symlink failed"); + symlinkf $mouse->{device}, "$prefix/dev/mouse" ? any::add_devfslink($prefix, "$prefix/dev/mouse") : log::l("creating $prefix/dev/mouse symlink failed"); if (arch() =~ /ppc/) { my $s = join('', diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 51ade899c..bb1991355 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -118,7 +118,7 @@ sub write_interface_conf { my @ip = split '\.', $intf->{IPADDR}; my @mask = split '\.', $intf->{NETMASK}; my $hwaddr = -e $prefix/sbin/ip && `LC_ALL= LANG= $prefix/sbin/ip -o link show $intf->{DEVICE}`; - if($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/; } + if ($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/; } add2hash($intf, { BROADCAST => join('.', mapn { int $_[0] | ~int $_[1] & 255 } \@ip, \@mask), NETWORK => join('.', mapn { int $_[0] & $_[1] } \@ip, \@mask), |