summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-21 19:11:37 +0000
committerColin Guthrie <colin@mageia.org>2013-11-21 19:32:32 +0000
commita50707aee9c1951cfc7c0d5c8d72780b08dc814c (patch)
treee68ec76a2226c6769d5c4719d01bf098ad118c27
parentf553d0da4de33c02fbd538bfec3e7a8666b660b8 (diff)
downloaddrakx-net-a50707aee9c1951cfc7c0d5c8d72780b08dc814c.tar
drakx-net-a50707aee9c1951cfc7c0d5c8d72780b08dc814c.tar.gz
drakx-net-a50707aee9c1951cfc7c0d5c8d72780b08dc814c.tar.bz2
drakx-net-a50707aee9c1951cfc7c0d5c8d72780b08dc814c.tar.xz
drakx-net-a50707aee9c1951cfc7c0d5c8d72780b08dc814c.zip
Fix paths
Some commands are no longer in /usr/sbin
-rw-r--r--NEWS2
-rwxr-xr-xbin/net_applet12
2 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index f2c36b6..9bc684c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+1.29
+- fix paths to some binaries which no longer live in /usr/sbin
- polkit: fix support for several third party net management commands (mga#11286)
- do not do costly urpmi check before forking net_monitor
diff --git a/bin/net_applet b/bin/net_applet
index 7f36960..1fa3a60 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -147,11 +147,11 @@ my %actions = (
},
'drakvpn' => {
name => N("Manage VPN connections"),
- launch => sub { run_program::raw({ detach => 1 }, '/usr/sbin/drakvpn') },
+ launch => sub { run_program::raw({ detach => 1 }, 'drakvpn') },
},
'confNetwork' => {
name => N("Configure Network"),
- launch => sub { system("/usr/sbin/drakconnect &") }
+ launch => sub { system("drakconnect &") }
},
'chooseInterface' => {
name => N("Watched interface"),
@@ -320,21 +320,21 @@ sub run_net_monitor() {
# stop reaping child processes or else gurpmi segfaults
local $SIG{CHLD} = "DEFAULT";
$in->do_pkgs->install('net_monitor');
- run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $current_interface) unless is_running('net_monitor');
+ run_program::raw({ detach => 1 }, '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');
+ run_program::raw({ detach => 1 }, 'draknetcenter') unless is_running('draknetcenter', 'root');
}
sub run_drakroam {
my ($o_ap) = @_;
- run_program::raw({ detach => 1 }, '/usr/sbin/drakroam', if_($o_ap, "--ap=$o_ap")) unless is_running('drakroam', 'root');
+ run_program::raw({ detach => 1 }, 'drakroam', if_($o_ap, "--ap=$o_ap")) unless is_running('drakroam', 'root');
}
sub run_drakids() {
$ifw_alert = 0;
if (is_running('drakids')) {
eval { $ifw->send_manage_request };
} else {
- run_program::raw({ detach => 1 }, '/usr/sbin/drakids');
+ run_program::raw({ detach => 1 }, 'drakids');
}
}
sub generate_wireless_menuitem {