summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-10-13 16:20:42 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-10-13 16:20:42 +0000
commit0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42 (patch)
tree5245c102bcf0309be77ef24a6c14b56b4377ded5
parent5aed4ecf3a466b7b26503f76a2578d31d6ddc996 (diff)
downloaddrakx-net-0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42.tar
drakx-net-0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42.tar.gz
drakx-net-0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42.tar.bz2
drakx-net-0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42.tar.xz
drakx-net-0a03fcbc500f6a9f8a44eedae9c4dc3e0e8aef42.zip
Run net_monitor from /usr/bin (to comply with new net_monitor layout).
-rwxr-xr-xbin/net_applet2
-rw-r--r--lib/network/connection_manager.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/net_applet b/bin/net_applet
index 8787c76..5c9d640 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -280,7 +280,7 @@ sub shouldStart() {
return getAutoStart();
}
sub run_net_monitor() {
- run_program::raw({ detach => 1 }, '/usr/sbin/net_monitor', '--defaultintf', $current_interface) unless is_running('net_monitor');
+ run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $current_interface) unless is_running('net_monitor');
}
sub run_netcenter() {
run_program::raw({ detach => 1 }, '/usr/bin/draknetcenter') unless is_running('draknetcenter', 'root');
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 4f30db0..33ca700 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -242,7 +242,7 @@ sub stop_connection {
sub monitor_connection {
my ($cmanager) = @_;
my $interface = $cmanager->{connection} && $cmanager->{connection}->get_interface or return;
- run_program::raw({ detach => 1 }, '/usr/sbin/net_monitor', '--defaultintf', $interface);
+ run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $interface);
}
sub toggle_would_disconnect {