summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-26 17:00:28 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-26 17:00:28 +0000
commit9ba81bbbe9b45ecb8af22c8563a50f9da61af966 (patch)
treef1358a1ed951283a92e7709d6e3d6ac1b9a19ddb /perl-install/network
parent650f81d5b9b764b4ee897e0b04f936dadcfafa9f (diff)
downloaddrakx-backup-do-not-use-9ba81bbbe9b45ecb8af22c8563a50f9da61af966.tar
drakx-backup-do-not-use-9ba81bbbe9b45ecb8af22c8563a50f9da61af966.tar.gz
drakx-backup-do-not-use-9ba81bbbe9b45ecb8af22c8563a50f9da61af966.tar.bz2
drakx-backup-do-not-use-9ba81bbbe9b45ecb8af22c8563a50f9da61af966.tar.xz
drakx-backup-do-not-use-9ba81bbbe9b45ecb8af22c8563a50f9da61af966.zip
get rid of global variables regarding connect/disconnect scripts
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm27
-rw-r--r--perl-install/network/tools.pm6
2 files changed, 17 insertions, 16 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a56b295df..a5956ba12 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -10,7 +10,7 @@ use any;
use mouse;
use network::network;
use network::tools;
-use MDK::Common::Globals "network", qw($in $connect_file $disconnect_file $connect_prog);
+use MDK::Common::Globals "network", qw($in);
my %conf;
@@ -40,11 +40,7 @@ sub detect {
sub init_globals {
my ($in) = @_;
- MDK::Common::Globals::init(
- in => $in,
- connect_file => "/etc/sysconfig/network-scripts/net_cnx_up",
- disconnect_file => "/etc/sysconfig/network-scripts/net_cnx_down",
- connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg");
+ MDK::Common::Globals::init(in => $in);
}
sub detect_timezone() {
@@ -1045,9 +1041,10 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet &
"), 1)
and do {
$netcnx->{type} = 'lan';
- output_with_perm("$::prefix$connect_file", 0755, qq(ifup eth0
+ write_cnx_file(
+ "$::prefix$network::tools::connect_file", 0755, qq(ifup eth0
));
- output("$::prefix$disconnect_file", 0755, qq(
+ output("$::prefix$network::tools::disconnect_file", 0755, qq(
ifdown eth0
));
$direct_net_install = 1;
@@ -1081,7 +1078,7 @@ if [ -n "\$DISPLAY" ]; then
/usr/sbin/net_monitor --connect
fi
else
- $connect_file
+ $network::tools::connect_file
fi
);
} elsif ($netcnx->{type}) {
@@ -1090,7 +1087,7 @@ fi
if [ -n "\$DISPLAY" ]; then
/usr/sbin/net_monitor --connect
else
- $connect_file
+ $network::tools::connect_file
fi
);
} else {
@@ -1105,11 +1102,11 @@ fi
if [ -n "\$DISPLAY" ]; then
/usr/sbin/net_monitor --connect
else
- $connect_file
+ $network::tools::connect_file
fi
);
}
- output_with_perm("$::prefix$connect_prog", 0755, $connect_cmd) if $connect_cmd;
+ output_with_perm("$::prefix$network::tools::connect_prog", 0755, $connect_cmd) if $connect_cmd;
$netcnx->{$_} = $netc->{$_} foreach qw(NET_DEVICE NET_INTERFACE);
$netcnx->{type} =~ /adsl/ or system("/sbin/chkconfig --del adsl 2> /dev/null");
@@ -1158,7 +1155,7 @@ sub load_conf {
}
sub get_net_device() {
- my $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up";
+ my $connect_file = $network::tools::connect_file;
my $network_file = "/etc/sysconfig/network";
if (cat_("$::prefix$connect_file") =~ /ifup/) {
if_(cat_($connect_file) =~ /^\s*ifup\s+(.*)/m, split(' ', $1))
@@ -1182,13 +1179,13 @@ sub start_internet {
init_globals($o);
#- give a chance for module to be loaded using kernel-BOOT modules...
$::isStandalone or modules::load_category('network/main|gigabit|usb');
- run_program::rooted($::prefix, $connect_file);
+ run_program::rooted($::prefix, $network::tools::connect_file);
}
sub stop_internet {
my ($o) = @_;
init_globals($o);
- run_program::rooted($::prefix, $disconnect_file);
+ run_program::rooted($::prefix, $network::tools::disconnect_file);
}
1;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 43dfff904..68eb03b86 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -5,13 +5,17 @@ use common;
use run_program;
use c;
use vars qw(@ISA @EXPORT @EXPORT_OK);
-use MDK::Common::Globals "network", qw($in $disconnect_file $connect_prog $connect_file);
+use MDK::Common::Globals "network", qw($in);
use MDK::Common::System qw(getVarsFromSh);
@ISA = qw(Exporter);
@EXPORT = qw(connect_backend connected connected_bg disconnect_backend is_dynamic_ip is_wireless_intf passwd_by_login read_providers_backend read_secret_backend test_connected write_cnx_script write_initscript write_secret_backend);
@EXPORT_OK = qw($in);
+our $connect_prog = "/etc/sysconfig/network-scripts/net_cnx_pg";
+my $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up";
+my $disconnect_file = "/etc/sysconfig/network-scripts/net_cnx_down";
+
sub write_cnx_script {
my ($netc, $o_type, $o_up, $o_down, $o_type2) = @_;
if ($o_type) {