Bug #479464: change pidfile path to be consistently /run

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 17 insertions, 9 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 3a065c5dc31f..ed919fb82bbb 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.346 2014/02/04 02:46:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.347 2014/02/08 21:17:46 robbat2 Exp $
+
+  08 Feb 2014; Robin H. Johnson <robbat2@gentoo.org>
+  files/dmeventd.initd-2.02.67-r1, files/lvmetad.initd-2.02.105,
+  files/lvmetad.initd-2.02.105-r2:
+  Bug #479464: change pidfile path to be consistently /run
 
   04 Feb 2014; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.105-r2.ebuild:
   Bug #448354: Fix cross-compile with thin.
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
index cad661d22e46..3c2f5f327aae 100644
--- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
+++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
@@ -1,7 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.2 2013/04/09 11:00:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $
+
+PIDFILE=/run/dmeventd.pid
+BIN=/sbin/dmeventd
 
 depend() {
 	# As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
@@ -11,13 +14,13 @@ depend() {
 
 start() {
 	ebegin "Starting dmeventd"
-	start-stop-daemon --start --exec /sbin/dmeventd --pidfile /var/run/dmeventd.pid
+	start-stop-daemon --start --exec $BIN --pidfile $PIDFILE
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dmeventd"
-	start-stop-daemon --stop --exec /sbin/dmeventd --pidfile /var/run/dmeventd.pid
+	start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE
 	eend $?
 }
 
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105
index c5a500850ebc..9baf59473833 100755
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105,v 1.2 2014/02/02 19:56:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105,v 1.3 2014/02/08 21:17:46 robbat2 Exp $
 
-pidfile="/var/run/lvmetad.pid"
+pidfile="/run/lvmetad.pid"
 command="/sbin/lvmetad"
 command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
 start_stop_daemon_args="--pidfile ${pidfile}"
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
index 17e28fa00772..e16d55c46156 100755
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2,v 1.1 2014/02/02 19:56:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2,v 1.2 2014/02/08 21:17:46 robbat2 Exp $
 
-pidfile="/var/run/lvmetad.pid"
+pidfile="/run/lvmetad.pid"
 command="/sbin/lvmetad"
 command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
 start_stop_daemon_args="--pidfile ${pidfile}"