summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-21 12:49:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-21 12:49:17 +0000
commit1275f71751148da1433ab6cc0c69124fb3d05baa (patch)
treefa1bfe30068c7db1964b9aa7aefc2cf7fac5a8f2
parent2d85f131e1ec9181038692493bb9daca277edb45 (diff)
downloaddrakx-1275f71751148da1433ab6cc0c69124fb3d05baa.tar
drakx-1275f71751148da1433ab6cc0c69124fb3d05baa.tar.gz
drakx-1275f71751148da1433ab6cc0c69124fb3d05baa.tar.bz2
drakx-1275f71751148da1433ab6cc0c69124fb3d05baa.tar.xz
drakx-1275f71751148da1433ab6cc0c69124fb3d05baa.zip
don't pass prefix to network::netconnect::main() (it doesn't use it)
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/network/netconnect.pm6
-rw-r--r--perl-install/printer/printerdrake.pm2
-rwxr-xr-xperl-install/standalone/drakconnect4
5 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b50c1be2e..7324c087e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -434,7 +434,7 @@ sub prep_net_suppl_media {
#- from install_steps_interactive:
local $::expert = $::expert;
require network::netconnect;
- network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+ network::netconnect::main($o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
require install_interactive;
install_interactive::upNetwork($o);
sleep(3);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 91c4c1995..12ae966bb 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -794,7 +794,7 @@ sub configureNetwork {
if ($o->{meta_class} eq 'firewall') {
require network::netconnect;
- network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+ network::netconnect::main($o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
} else {
require network::network;
network::network::easy_dhcp($o->{modules_conf}, $o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
@@ -1073,7 +1073,7 @@ sub summary {
clicked => sub {
local $::expert = $::expert;
require network::netconnect;
- network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
+ network::netconnect::main($o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
#- in case netcnx type is not updated.
require network::network;
network::network::probe_netcnx_type($o->{prefix}, $o->{netc}, $o->{intf}, $o->{netcnx});
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 2adb960fd..c593d5045 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -75,7 +75,7 @@ sub get_subwizard {
# configuring all network devices
sub real_main {
- my ($_prefix, $netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
+ my ($netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
my $netc = $o_netc ||= {};
my $mouse = $o_mouse ||= {};
my $intf = $o_intf ||= {};
@@ -1387,8 +1387,8 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet &
}
sub main {
- my ($_prefix, $netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
- eval { real_main('', , $netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) };
+ my ($netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
+ eval { real_main($netcnx, $in, $modules_conf, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) };
my $err = $@;
if ($err) { # && $in->isa('interactive::gtk')
$err =~ /wizcancel/ and $in->exit(0);
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 2c850833c..19e271e0e 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3703,7 +3703,7 @@ sub check_network {
my $o = $in;
require network::netconnect;
network::netconnect::main(
- $o->{prefix}, $o->{netcnx} ||= {},
+ $o->{netcnx} ||= {},
$in, $o->{modules_conf}, $o->{netc}, $o->{mouse},
$o->{intf});
# my ($prefix, $netcnx, $in, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index dc9f96c91..bb45f2336 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -136,7 +136,7 @@ $window1->{window}->add(
clicked => sub {
local ($::isWizard, $::Wizard_finished) = (1, 1);
eval { # For wizcancel
- network::netconnect::main('', $netcnx, $in, $modules_conf, $netc, undef, $intf);
+ network::netconnect::main($netcnx, $in, $modules_conf, $netc, undef, $intf);
$button_apply->set_sensitive(1);
update();
};
@@ -660,7 +660,7 @@ sub check_field {
sub add_intf() {
$::isWizard = 1;
- network::netconnect::main('', $netcnx, $in, $modules_conf, $netc, undef, $intf);
+ network::netconnect::main($netcnx, $in, $modules_conf, $netc, undef, $intf);
$in->exit(0);
}