summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaio Begotti <caio1982@mandriva.org>2009-12-09 18:11:12 +0000
committerCaio Begotti <caio1982@mandriva.org>2009-12-09 18:11:12 +0000
commit28429b9374db93b2696919be5a185724bb73b6f6 (patch)
tree5434317b3909a8e2ae46f6f67e992848b1cb6f1d
parentddab5654236cc0d6dc71f79ac492f420ffc94540 (diff)
downloaddrakx-net-28429b9374db93b2696919be5a185724bb73b6f6.tar
drakx-net-28429b9374db93b2696919be5a185724bb73b6f6.tar.gz
drakx-net-28429b9374db93b2696919be5a185724bb73b6f6.tar.bz2
drakx-net-28429b9374db93b2696919be5a185724bb73b6f6.tar.xz
drakx-net-28429b9374db93b2696919be5a185724bb73b6f6.zip
fix multiple instances of draknetcenter (caught on instanton)
-rw-r--r--NEWS4
-rwxr-xr-xbin/draknetcenter5
2 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ab5e402..73939fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.86.4:
+- avoid multiple instances of draknetcenter for the
+ same user (if it's already running)
+
0.86.3:
- do not group all hosts pointing at the same IP together (#30168)
diff --git a/bin/draknetcenter b/bin/draknetcenter
index b2f8d14..7396631 100755
--- a/bin/draknetcenter
+++ b/bin/draknetcenter
@@ -2,19 +2,22 @@
# Olivier Blin, 2007 <oblin@mandriva.com>
# Licensed under the GPL
-
use strict;
use lib qw(/usr/lib/libDrakX);
# i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
BEGIN { unshift @::textdomains, 'drakx-net' }
+use common;
use standalone;
use network::network;
use network::monitor;
use network::netcenter;
use dbus_object;
+#- Allow multiple instances, but only one per user:
+is_running('draknetcenter') and die "draknetcenter already running\n";
+
my $in = 'interactive'->vnew('su');
my $net = {};
network::network::read_net_conf($net);