From 5f3bbbda44dfb38c2d64996d604fbd1b917b32b761ff01bcd8ca3c0aa1e57baa Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 19 May 2010 06:43:19 +0000 Subject: [PATCH] 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 --- powerman-piddir.patch | 24 ++++++++++++++++++++++++ powerman.changes | 6 ++++++ powerman.spec | 4 +++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 powerman-piddir.patch diff --git a/powerman-piddir.patch b/powerman-piddir.patch new file mode 100644 index 0000000..e27070b --- /dev/null +++ b/powerman-piddir.patch @@ -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 + ## diff --git a/powerman.changes b/powerman.changes index eddfd42..021c66d 100644 --- a/powerman.changes +++ b/powerman.changes @@ -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 diff --git a/powerman.spec b/powerman.spec index 28221c4..eae82c4 100644 --- a/powerman.spec +++ b/powerman.spec @@ -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}/*