summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/ftp.pm4
-rw-r--r--perl-install/http.pm4
-rw-r--r--perl-install/install2.pm10
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/install_steps.pm8
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/network/netconnect.pm4
-rw-r--r--perl-install/printer/printerdrake.pm6
-rwxr-xr-xperl-install/standalone/drakauth4
-rwxr-xr-xperl-install/standalone/drakgw4
-rwxr-xr-xperl-install/standalone/drakpxe4
12 files changed, 29 insertions, 29 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ab95ab2d5..da4b667c2 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1077,8 +1077,8 @@ sub set_authentication {
$_ = "#~$_" unless /^#/;
$_ .= "$t $nis\n" if eof;
} "$::prefix/etc/yp.conf";
- require network;
- network::write_conf("$::prefix/etc/sysconfig/network", $netc);
+ require network::network;
+ network::network::write_conf("$::prefix/etc/sysconfig/network", $netc);
$when_network_is_up->(sub {
run_program::rooted($::prefix, 'nisdomainname', $domain);
diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index c971898a1..b0f7046b1 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -2,7 +2,7 @@ package ftp; # $Id$
use Net::FTP;
-use network;
+use network::network;
use log;
my %hosts;
@@ -31,7 +31,7 @@ sub new {
my $ftp;
foreach (1..10) {
- $ftp = Net::FTP->new(network::resolv($host), %options) or die;
+ $ftp = Net::FTP->new(resolv($host), %options) or die;
$ftp && $ftp->login($o_login, $o_password) and last;
log::l("ftp login failed, sleeping before trying again");
diff --git a/perl-install/http.pm b/perl-install/http.pm
index 4e19eed8b..f1c812b62 100644
--- a/perl-install/http.pm
+++ b/perl-install/http.pm
@@ -1,7 +1,7 @@
package http; # $Id$
use IO::Socket;
-use network;
+use network::network;
my $sock;
@@ -14,7 +14,7 @@ sub getFile {
$url =~ m|/XXX$| and return; #- force closing connection.
my ($host, $port, $path) = $url =~ m,^http://([^/:]+)(?::(\d+))?(/\S*)?$,;
- $host = network::resolv($host);
+ $host = resolv($host);
$sock = IO::Socket::INET->new(PeerAddr => $host,
PeerPort => $port || 80,
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index f45ae8dbe..9233123c1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -242,8 +242,8 @@ sub summary {
sub configureNetwork {
my ($_clicked, $_ent_number, $auto) = @_;
#- get current configuration of network device.
- require network;
- eval { network::read_all_conf($o->{prefix}, $o->{netc}, $o->{intf}) };
+ require network::network;
+ eval { network::network::read_all_conf($o->{prefix}, $o->{netc}, $o->{intf}) };
installStepsCall($o, $auto, 'configureNetwork') if !$o->{isUpgrade};
}
#------------------------------------------------------------------------------
@@ -450,16 +450,16 @@ sub main {
#- get stage1 network configuration if any.
log::l('found /tmp/network');
$o->{netc} ||= {};
- add2hash($o->{netc}, network::read_conf('/tmp/network'));
+ add2hash($o->{netc}, network::network::read_conf('/tmp/network'));
if (my ($file) = glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
- my $l = network::read_interface_conf($file);
+ my $l = network::network::read_interface_conf($file);
$o->{intf} ||= { $l->{DEVICE} => $l };
}
if (-e '/etc/resolv.conf') {
my $file = '/etc/resolv.conf';
log::l("found network config file $file");
- add2hash($o->{netc}, network::read_resolv_conf($file));
+ add2hash($o->{netc}, network::network::read_resolv_conf($file));
}
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 093b90be2..1773a9507 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -873,9 +873,9 @@ sub generate_automatic_stage1_params {
if ($intf->{BOOTPROTO} eq 'dhcp') {
push @ks, "network:dhcp";
} else {
- require network;
+ require network::network;
push @ks, "network:static", "ip:$intf->{IPADDR}", "netmask:$intf->{NETMASK}", "gateway:$o->{netc}{GATEWAY}";
- my @dnss = network::dnsServers($o->{netc});
+ my @dnss = network::network::dnsServers($o->{netc});
push @ks, "dns:$dnss[0]" if @dnss;
}
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5d36342c7..4ecdcfe25 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -322,8 +322,8 @@ sub beforeInstallPackages {
#- some packages need such files for proper installation.
install_any::write_fstab($o);
- require network;
- network::add2hosts("$o->{prefix}/etc/hosts", "localhost.localdomain", "127.0.0.1");
+ require network::network;
+ network::network::add2hosts("$o->{prefix}/etc/hosts", "localhost.localdomain", "127.0.0.1");
log::l("setting excludedocs to $o->{excludedocs}");
substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$o->{prefix}/etc/rpm/macros";
@@ -618,8 +618,8 @@ sub selectMouse($) {
#------------------------------------------------------------------------------
sub configureNetwork {
my ($o) = @_;
- require network;
- network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf});
+ require network::network;
+ network::network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf});
if ($o->{method} =~ /ftp|http|nfs/) {
$o->{netcnx}{type} = 'lan';
foreach ("up", "down") {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b30508ad1..5863a64a7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -860,7 +860,7 @@ sub summaryBefore {
$o->configurePrinter(0);
install_any::preConfigureTimezone($o);
#- get back network configuration.
- require network;
+ require network::network;
eval {
network::network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}, $o->{netcnx} ||= {});
};
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a051dba74..cdfd75425 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -181,7 +181,7 @@ If you don't want to use the auto detection, deselect the checkbox.
}
my $success = 1;
- network::configureNetwork2($in, $prefix, $netc, $intf);
+ network::network::configureNetwork2($in, $prefix, $netc, $intf);
my $network_configured = 1;
step_2_2:
@@ -213,7 +213,7 @@ Test your connection via net_monitor or mcc. If your connection doesn't work, yo
undef $::Wizard_finished;
step_5:
- $network_configured or network::configureNetwork2($in, $prefix, $netc, $intf);
+ $network_configured or network::network::configureNetwork2($in, $prefix, $netc, $intf);
my $connect_cmd;
if ($netcnx->{type} =~ /modem/ || $netcnx->{type} =~ /isdn_external/) {
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 5a85d2467..59abb72d2 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -5,7 +5,7 @@ use strict;
use common;
use modules;
-use network;
+use network::network;
use log;
use interactive;
use printer::main;
@@ -1247,7 +1247,7 @@ sub setup_smb {
} else {
die qq(The "smb://" URI must at least contain the server name and the share name!\n);
}
- if (network::is_ip($smbserver)) {
+ if (is_ip($smbserver)) {
$smbserverip = $smbserver;
$smbserver = "";
}
@@ -1336,7 +1336,7 @@ sub setup_smb {
not_edit => 1, format => \&translate, sort => 0,
allow_empty_list => 1, type => 'combo' }) ],
complete => sub {
- if (!network::is_ip($smbserverip) && $smbserverip ne "") {
+ if (!is_ip($smbserverip) && $smbserverip ne "") {
$in->ask_warn('', N("IP address should be in format 1.2.3.4"));
return (1,1);
}
diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth
index 939b57c0c..6f2dfe236 100755
--- a/perl-install/standalone/drakauth
+++ b/perl-install/standalone/drakauth
@@ -7,11 +7,11 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use common;
use interactive;
use any;
-use network;
+use network::network;
my $netc = {};
my $intf = {};
-network::read_all_conf('', $netc, $intf);
+read_all_conf('', $netc, $intf);
my $in = 'interactive'->vnew('su');
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 43c2e752a..52960c204 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -28,7 +28,7 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use common;
use detect_devices;
use interactive;
-use network;
+use network::network;
use log;
use c;
use network::netconnect;
@@ -253,7 +253,7 @@ I am about to setup your Local Area Network with that adapter.", $format->($devi
defined $device or quit_global($in, 0);
}
log::explanations("Choosing network device: $device");
-my $conf = network::read_interface_conf("/etc/sysconfig/network-scripts/ifcfg-$device");
+my $conf = read_interface_conf("/etc/sysconfig/network-scripts/ifcfg-$device");
my $server_ip = $conf->{IPADDR} ||= network::network::read_dhcpd_conf()->{option_routers}[0] ||= "192.168.1.1";
my $lan_address = $server_ip =~ m/(.*)\.(.*)/ && $1 ? "$1.0" : "192.168.1.0";
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 4ceb492c7..9fd6a3b20 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -25,7 +25,7 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use common;
use interactive;
-use network;
+use network::network;
use log;
use c;
@@ -49,7 +49,7 @@ $::direct = grep { /-direct/ } @ARGV;
#- get network configuration.
my $netc = {};
my $intf = {};
-network::read_all_conf('', $netc, $intf);
+network::network::read_all_conf('', $netc, $intf);
my $in = 'interactive'->vnew('su');
$::Wizard_title = N("PXE Server Configuration");
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-03 11:12:15 +0000