summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2014-04-10 17:22:57 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2014-04-10 17:22:57 +0000
commitb1f31806059686d3995082022f9eab32f38685a4 (patch)
tree566965f349df65beea5f3729345f3c90c88a1256 /dev-util
parentFix arguments for systemd's unit start/stop options. (diff)
downloadgentoo-2-b1f31806059686d3995082022f9eab32f38685a4.tar.gz
gentoo-2-b1f31806059686d3995082022f9eab32f38685a4.tar.bz2
gentoo-2-b1f31806059686d3995082022f9eab32f38685a4.zip
Add WorkingDirectory and fix arguments for systemd's unit start/stop options
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/buildbot-slave/ChangeLog7
-rw-r--r--dev-util/buildbot-slave/files/buildslave.service7
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-util/buildbot-slave/ChangeLog b/dev-util/buildbot-slave/ChangeLog
index 9f7febea3b58..257c22c130c0 100644
--- a/dev-util/buildbot-slave/ChangeLog
+++ b/dev-util/buildbot-slave/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/buildbot-slave
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.57 2014/02/24 01:46:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.58 2014/04/10 17:22:57 hwoarang Exp $
+
+ 10 Apr 2014; Markos Chandras <hwoarang@gentoo.org> files/buildslave.service:
+ Add WorkingDirectory and fix arguments for systemd's unit start/stop
+ options. This will be removed in the next version bump since upstream has
+ their own systemd files
24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
buildbot-slave-0.8.8-r1.ebuild:
diff --git a/dev-util/buildbot-slave/files/buildslave.service b/dev-util/buildbot-slave/files/buildslave.service
index 8d54619fbad6..5c8e483fe83a 100644
--- a/dev-util/buildbot-slave/files/buildslave.service
+++ b/dev-util/buildbot-slave/files/buildslave.service
@@ -5,8 +5,11 @@ After=local-fs.target network.target
[Service]
Type=forking
User=buildbot
-ExecStart=/usr/bin/buildslave start /var/lib/buildslave
-ExecStop=/usr/bin/buildslave stop /var/lib/buildslave
+WorkingDirectory=/var/lib/buildslave
+# The following assume there is a 'slave' directory
+# in $WorkingDirectory with the slave configuration files
+ExecStart=/usr/bin/buildslave start slave
+ExecStop=/usr/bin/buildslave stop slave
[Install]
WantedBy=multi-user.target