summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-07-13 09:36:58 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-07-13 09:36:58 +0000
commit61a84e5678ef93dd5a4490cf72d7ae536ea96092 (patch)
tree7a2d665503a898575b8ec626793e7a7a6ba3e730
parentUpdate pkg.m4 from pkg-config-0.26 to pkg-config-0.27 for PKG_INSTALLDIR (--w... (diff)
downloadgentoo-2-61a84e5678ef93dd5a4490cf72d7ae536ea96092.tar.gz
gentoo-2-61a84e5678ef93dd5a4490cf72d7ae536ea96092.tar.bz2
gentoo-2-61a84e5678ef93dd5a4490cf72d7ae536ea96092.zip
x2gocleansessions uses x2goserver.pid for PID file, update init script accordingly. Reported by <xenon.kay@gmail.com> in bug #426258
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
-rw-r--r--net-misc/x2goserver/ChangeLog6
-rw-r--r--net-misc/x2goserver/files/x2goserver.init7
2 files changed, 9 insertions, 4 deletions
diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index ca881fd86bc6..3164a1e3613d 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/x2goserver
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.10 2012/07/11 08:33:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.11 2012/07/13 09:36:58 voyageur Exp $
+
+ 13 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> files/x2goserver.init:
+ x2gocleansessions uses x2goserver.pid for PID file, update init script
+ accordingly. Reported by <xenon.kay@gmail.com> in bug #426258
11 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
x2goserver-3.1.1.3.ebuild:
diff --git a/net-misc/x2goserver/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
index 6834582136d0..1947fcf12669 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,13 +1,14 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.2 2012/03/14 22:30:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/files/x2goserver.init,v 1.3 2012/07/13 09:36:58 voyageur Exp $
DAEMON=/usr/sbin/x2gocleansessions
+PIDFILE=/var/run/x2goserver.pid
start() {
ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \
+ start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
--exec ${DAEMON} -- $DAEMON_OPTS
eend $?
@@ -15,6 +16,6 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
+ start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
eend $?
}