[gentoo-commits] gentoo-x86 commit in sys-power/nut/files: upsd.rc6

[Robin H. Johnson (robbat2)]

robbat2     07/10/09 00:42:45

  Modified:             upsd.rc6
  Log:
  Fix bug #195125 for pidfile locations.
  (Portage version: 2.1.3.12)

Revision  Changes    Path
1.3                  sys-power/nut/files/upsd.rc6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/files/upsd.rc6?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/files/upsd.rc6?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/nut/files/upsd.rc6?r1=1.2&r2=1.3

Index: upsd.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsd.rc6,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upsd.rc6	25 Apr 2007 05:38:46 -0000	1.2
+++ upsd.rc6	9 Oct 2007 00:42:45 -0000	1.3
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsd.rc6,v 1.2 2007/04/25 05:38:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsd.rc6,v 1.3 2007/10/09 00:42:45 robbat2 Exp $
 
 opts="reload"
+pidfile=/var/lib/nut/upsd.pid
 
 depend() {
 	need net upsdrv
@@ -15,7 +16,7 @@
 	# clean up first
 	pkill -u root -x upsd
 	sleep 1s
-	rm -f /var/state/nut/upsd.pid
+	rm -f ${pidfile}
 	# now start up
 	start-stop-daemon --start --quiet --exec /usr/sbin/upsd
 	eend $?
@@ -23,12 +24,12 @@
 
 stop() {
 	ebegin "Stopping upsd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/nut/upsd.pid
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading upsd"
-	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile /var/lib/nut/upsd.pid
+	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
 	eend $?
 }



-- 
gentoo-commits@g.o mailing list