From ec747dc1097a5f80d220311dc89e9d6ec32cab31 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 28 Nov 2002 13:26:25 +0000 Subject: perl_checker adaptations --- perl-install/network/adsl.pm | 2 +- perl-install/network/ethernet.pm | 2 +- perl-install/network/isdn.pm | 2 +- perl-install/network/netconnect.pm | 12 ++++++------ perl-install/network/network.pm | 4 ++-- perl-install/network/tools.pm | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'perl-install/network') diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index d47874460..875da17b6 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -101,7 +101,7 @@ sub adsl_conf { my ($adsl, $netc, $intf, $adsl_type) = @_; adsl_conf_step_1: - adsl_ask_info ($adsl, $netc, $intf) or return; + adsl_ask_info($adsl, $netc, $intf) or return; adsl_conf_step_2: $adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1; adsl_conf_backend($adsl, $netc, $adsl_type); diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 4752258ce..bee1c283a 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -174,7 +174,7 @@ sub configureNetwork { local $_; any::load_category($in, 'network/main|usb|pcmcia', !$::expert, 1) or return; my @l = detect_devices::getNet() or die N("no network card found"); - my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef); configureNetwork_step_1: my $n_card = 0; diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 0466c4030..b485c2e1c 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -101,7 +101,7 @@ sub isdn_write_config_backend { symlinkf("ioptions" . $bundle, "$prefix/etc/ppp/ioptions"); } else { my $f = "$prefix/etc/isdn/profile/link/myisp"; - output ($f, + output($f, qq( I4L_USERNAME="$isdn->{login}" I4L_SYSNAME="" diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8f0a78683..1e3ab537f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -67,7 +67,7 @@ sub detect { modules::load_category('network/main|usb'); require network::ethernet; network::ethernet->import; - my @all_cards = conf_network_card_backend (undef, undef, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend(undef, undef, undef, undef, undef, undef); map { $auto_detect->{lan}{$_->[0]} = $_->[1] } @all_cards if !$net_install; my $adsl = {}; @@ -121,7 +121,7 @@ sub init_globals { sub main { my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $direct_fr, $noauto) = @_; - init_globals ($in, $prefix); + init_globals($in, $prefix); $netc->{minus_one} = 0; #When one configure an eth in dhcp without gateway $::isInstall and $in->set_help('configureNetwork'); $::isStandalone and read_net_conf($prefix, $netcnx, $netc); # REDONDANCE with intro. FIXME @@ -350,7 +350,7 @@ sub save_conf { modules::load_category('network/main|usb'); require network::ethernet; network::ethernet->import; - my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); + my @all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef); $intf = { %$intf }; @@ -560,7 +560,7 @@ sub load_conf { /^DOMAINNAME2=(.*)$/ and $netc->{DOMAINNAME2} = $1; } } - $system_name && $domain_name and $netc->{HOSTNAME} = join ('.', $system_name, $domain_name); + $system_name && $domain_name and $netc->{HOSTNAME} = join '.', $system_name, $domain_name; $adsl_pptp->{$_} = $adsl_pppoe->{$_} foreach 'login', 'passwd', 'passwd2'; $isdn_external->{$_} = $modem->{$_} foreach 'device', 'connection', 'phone', 'domain', 'dns1', 'dns2', 'login', 'passwd', 'auth'; $netcnx->{adsl_pptp} = $adsl_pptp; @@ -609,13 +609,13 @@ sub set_net_conf { sub start_internet { my ($o) = @_; - init_globals ($o, $o->{prefix}); + init_globals($o, $o->{prefix}); run_program::rooted($prefix, $connect_file); } sub stop_internet { my ($o) = @_; - init_globals ($o, $o->{prefix}); + init_globals($o, $o->{prefix}); run_program::rooted($prefix, $disconnect_file); } diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index b99bc38b7..35882507f 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -257,14 +257,14 @@ sub dns { my $mask = masked_ip($ip); my @masked = masked_ip($ip) =~ $ip_regexp; $masked[3] = 2; - join (".", @masked); + join ".", @masked; } sub gateway { my ($ip) = @_; my @masked = masked_ip($ip) =~ $ip_regexp; $masked[3] = 1; - join (".", @masked); + join ".", @masked; } diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 78075fd68..55c8b8a89 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -18,7 +18,7 @@ sub write_cnx_script { $netc->{internet_cnx}{$type}{type} = $type2; } else { foreach ($connect_file, $disconnect_file) { - output ("$prefix$_", + output("$prefix$_", '#!/bin/bash ' . if_(!$netc->{at_boot}, 'if [ "x$1" == "x--boot_time" ]; then exit; fi ') . $netc->{internet_cnx}{$netc->{internet_cnx_choice}}{$_}); @@ -223,7 +223,7 @@ sub disconnected {} sub write_initscript { - output ("$prefix/etc/rc.d/init.d/internet", sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file)); + output("$prefix/etc/rc.d/init.d/internet", sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file)); #!/bin/bash # # internet Bring up/down internet connection @@ -269,7 +269,7 @@ exit 0 EOF chmod 0755, "$prefix/etc/rc.d/init.d/internet"; $::isStandalone ? system("/sbin/chkconfig --add internet") : do { - symlinkf ("../init.d/internet", "$prefix/etc/rc.d/rc$_") foreach + symlinkf("../init.d/internet", "$prefix/etc/rc.d/rc$_") foreach '0.d/K11internet', '1.d/K11internet', '2.d/K11internet', '3.d/S89internet', '5.d/S89internet', '6.d/K11internet'; }; } -- cgit v1.2.1