diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2007-10-09 00:42:45 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-10-09 00:42:45 +0000 |
| commit | 3365a05a94600afc7591b6962949efb2003ca728 (patch) | |
| tree | 90a0a290d1907f559cc4a63bfbf018aa20acfdca /sys-power/nut | |
| parent | Stable for HPPA (bug #194959). (diff) | |
| download | gentoo-2-3365a05a94600afc7591b6962949efb2003ca728.tar.gz gentoo-2-3365a05a94600afc7591b6962949efb2003ca728.tar.bz2 gentoo-2-3365a05a94600afc7591b6962949efb2003ca728.zip | |
Fix bug #195125 for pidfile locations.
(Portage version: 2.1.3.12)
Diffstat (limited to 'sys-power/nut')
| -rw-r--r-- | sys-power/nut/ChangeLog | 5 | ||||
| -rwxr-xr-x | sys-power/nut/files/upsd.rc6 | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog index d88a65f00fa6..d87767199bcf 100644 --- a/sys-power/nut/ChangeLog +++ b/sys-power/nut/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-power/nut # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.45 2007/07/01 15:59:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.46 2007/10/09 00:42:44 robbat2 Exp $ + + 09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org> files/upsd.rc6: + Fix bug #195125 for pidfile locations. 01 Jul 2007; Raúl Porcel <armin76@gentoo.org> nut-2.0.5-r2.ebuild: Add ~alpha keyword as some user requested it diff --git a/sys-power/nut/files/upsd.rc6 b/sys-power/nut/files/upsd.rc6 index b6422660b3e8..0cb34f620878 100755 --- a/sys-power/nut/files/upsd.rc6 +++ b/sys-power/nut/files/upsd.rc6 @@ -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 @@ start() { # 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 @@ start() { 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 $? } |