Accepting request 40307 from home:oertel:branches:openSUSE:Factory

Copy from home:oertel:branches:openSUSE:Factory/powerman via accept of submit request 40307 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/40307
OBS-URL: https://build.opensuse.org/package/show/hardware/powerman?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2010-05-19 06:43:19 +00:00 committed by Git OBS Bridge
parent fe3768cc38
commit 5f3bbbda44
3 changed files with 33 additions and 1 deletions

24
powerman-piddir.patch Normal file
View File

@ -0,0 +1,24 @@
--- scripts/powerman.init.in
+++ scripts/powerman.init.in
@@ -34,7 +34,8 @@
DAEMON="$sbindir/powermand"
#DAEMON_ARGS=
CONFIG=$sysconfdir/powerman/powerman.conf
-PIDFILE="$localstatedir/run/powerman/powermand.pid"
+PIDDIR="$localstatedir/run/powerman"
+PIDFILE="$PIDDIR/powermand.pid"
#NICE=
USER=@RUN_AS_USER@
#SIGHUP_RELOAD=
@@ -53,7 +54,10 @@
SCRIPT_NAME="`basename \"$0\" .init | sed 's/^[SK][0-9][0-9]*//'`"
SIGTERM_TIMEOUT="3"
STATUS=0
-
+ if [ ! -d "$PIDDIR" ] ; then
+ mkdir "$PIDDIR"
+ chown $USER $PIDDIR
+ fi
# Read configuration defaults to override variables:
# $DAEMON_ARGS, $CONFIG, $PIDFILE, $USER, $NICE, $SIGHUP_RELOAD
##

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 19 02:38:24 CEST 2010 - ro@suse.de
- keep /var/run/powerman only as ghost in filelist
and create it in initscript if missing
-------------------------------------------------------------------
Fri Aug 14 15:00:56 CEST 2009 - sbrabec@suse.cz

View File

@ -25,6 +25,7 @@ License: GPL
Group: Productivity/Clustering/HA
Url: http://powerman.sourceforge.net/
Source: %{name}-%{version}.tar.bz2
Patch0: powerman-piddir.patch
Summary: Centralized Power Control for Clusters
BuildRequires: curl-devel ncurses-devel tcpd-devel
# For directory ownership:
@ -81,6 +82,7 @@ Authors:
%prep
%setup -q
%patch0
%build
# --with-genders
@ -117,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog ChangeLog-1.0 DISCLAIMER COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/stonith/plugins/external/powerman
%dir %attr(0755,daemon,root) %config %{_localstatedir}/run/powerman
%dir %attr(0755,daemon,root) %ghost %{_localstatedir}/run/powerman
%doc %{_mandir}/man?/*.*
%exclude %doc %{_mandir}/man3/*.*
%{_sbindir}/*