diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-26 17:00:28 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-26 17:00:28 +0000 |
| commit | 9ba81bbbe9b45ecb8af22c8563a50f9da61af966 (patch) | |
| tree | f1358a1ed951283a92e7709d6e3d6ac1b9a19ddb /perl-install/standalone/net_monitor | |
| parent | 650f81d5b9b764b4ee897e0b04f936dadcfafa9f (diff) | |
| download | drakx-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/standalone/net_monitor')
| -rwxr-xr-x | perl-install/standalone/net_monitor | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 2530f891f..6594e61dc 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -30,7 +30,7 @@ use ugtk2 qw(:helpers :wrappers :create); use common; use network::netconnect; use network::tools; -use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_file $connect_prog); +use MDK::Common::Globals "network", qw($in); if ("@ARGV" =~ /--status/) { print connected(); exit(0) } my $force = "@ARGV" =~ /--force/; @@ -75,12 +75,7 @@ my ($width, $height) = (300, 150); network::netconnect::load_conf($netcnx, $netc, $intf); network::netconnect::read_net_conf('', $netcnx, $netc); -MDK::Common::Globals::init( - in => $in, - prefix => '', - 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); gtkadd($window1->{window}, gtkpack_(Gtk2::VBox->new(0,5), @@ -423,7 +418,7 @@ sub update() { $button_connect->set("label", $isconnected == 1 ? N("Disconnect %s", $netcnx->{type}) : N("Connect %s", $netcnx->{type})); $button_connect->set_sensitive(1); } - if (!(-e $connect_file && -e $disconnect_file)) { + if (!(-e $network::tools::connect_file && -e $network::tools::disconnect_file)) { $button_connect->set_sensitive(0); $button_connect->set("label", N("No internet connection configured")); } |