[sblim-cmpi-nfsv3] Update provider registration script to use systemctl to stop/start sfcb, Use new macros for %%pre/%%
vcrhonek
vcrhonek at fedoraproject.org
Mon Mar 2 14:46:20 UTC 2015
commit b3f81dd6288dd9b258b0ac03638efd2b025209be
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Mon Mar 2 15:46:13 2015 +0100
Update provider registration script to use systemctl to stop/start sfcb, Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
sblim-cmpi-nfsv3-1.1.1-prov-reg-sfcb-systemd.patch | 42 +++++++++++++++++++++
sblim-cmpi-nfsv3.spec | 43 +++++++---------------
2 files changed, 56 insertions(+), 29 deletions(-)
---
diff --git a/sblim-cmpi-nfsv3-1.1.1-prov-reg-sfcb-systemd.patch b/sblim-cmpi-nfsv3-1.1.1-prov-reg-sfcb-systemd.patch
new file mode 100644
index 0000000..e2f7f0e
--- /dev/null
+++ b/sblim-cmpi-nfsv3-1.1.1-prov-reg-sfcb-systemd.patch
@@ -0,0 +1,42 @@
+diff -up sblim-cmpi-nfsv3-1.1.1/provider-register.sh.orig sblim-cmpi-nfsv3-1.1.1/provider-register.sh
+--- sblim-cmpi-nfsv3-1.1.1/provider-register.sh.orig 2015-02-25 14:15:40.839986333 +0100
++++ sblim-cmpi-nfsv3-1.1.1/provider-register.sh 2015-02-25 14:16:29.030152650 +0100
+@@ -351,20 +351,8 @@ sfcb_rebuild()
+ if ps -C sfcbd > /dev/null 2>&1
+ then
+ # sfcb is running -- need to restart
+- for INITSCRIPT in /etc/init.d/sfcb /usr/local/etc/init.d/sfcb none
+- do
+- if test -x $INITSCRIPT
+- then
+- break;
+- fi
+- done
+ chatter "Shutting down sfcb."
+- if test $INITSCRIPT = none
+- then
+- killall sfcbd
+- else
+- $INITSCRIPT stop
+- fi
++ systemctl stop sblim-sfcb
+ t=0
+ while ps -C sfcbd > /dev/null 2>&1
+ do
+@@ -385,14 +373,8 @@ sfcb_rebuild()
+ return 1
+ fi
+
+- if test $INITSCRIPT = none
+- then
+- echo "No init script found - you need to start sfcbd manually." >&2
+- return 1
+- else
+- chatter "Restarting sfcb."
+- $INITSCRIPT start
+- fi
++ chatter "Restarting sfcb."
++ systemctl start sblim-sfcb
+ else
+ # Not running - rebuild repository
+ chatter "Rebuilding repository."
diff --git a/sblim-cmpi-nfsv3.spec b/sblim-cmpi-nfsv3.spec
index feb1a1f..8c15944 100644
--- a/sblim-cmpi-nfsv3.spec
+++ b/sblim-cmpi-nfsv3.spec
@@ -3,7 +3,7 @@
Summary: SBLIM nfsv3 instrumentation
Name: sblim-cmpi-nfsv3
Version: 1.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
License: EPL
Group: Applications/System
URL: http://sourceforge.net/projects/sblim/
@@ -13,6 +13,8 @@ Source0: http://downloads.sourceforge.net/project/sblim/providers/%{name}
Patch0: sblim-cmpi-nfsv3-1.1.1-docdir.patch
#Patch1: use Pegasus root/interop instead of root/PG_Interop
Patch1: sblim-cmpi-nfsv3-1.1.1-pegasus-interop.patch
+# Patch2: call systemctl in provider registration
+Patch2: sblim-cmpi-nfsv3-1.1.1-prov-reg-sfcb-systemd.patch
BuildRequires: sblim-cmpi-base-devel sblim-cmpi-devel
Requires: sblim-cmpi-base cim-server cim-schema
@@ -44,6 +46,7 @@ SBLIM Base Fsvol Testcase Files for SBLIM Testsuite
%setup -q
%patch0 -p1 -b .docdir
%patch1 -p1 -b .pegasus-interop
+%patch2 -p1 -b .prov-reg-sfcb-systemd
%build
%ifarch s390 s390x ppc ppc64
@@ -78,44 +81,26 @@ echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
%files test
%{_datadir}/sblim-testsuite
-%global PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext
+%global SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
+
+%global REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration
%pre
-# If upgrading, deregister old version
-if [ $1 -gt 1 ]; then
- %{_datadir}/%{name}/provider-register.sh -d \
- -r %{_datadir}/%{name}/*.registration \
- -m %{_datadir}/%{name}/*.mof \
- > /dev/null 2>&1 || :;
-fi
+%sblim_pre
%post
-/sbin/ldconfig
-# tog-pegasus needs some schemes registered first
-if [ -x /usr/bin/peg-loadmof.sh ]; then
- peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof > /dev/null 2>&1 || :;
- /sbin/service tog-pegasus try-restart > /dev/null 2>&1 || :;
-fi
-if [ $1 -ge 1 ]; then
-# Register Schema and Provider
- %{_datadir}/%{name}/provider-register.sh \
- -r %{_datadir}/%{name}/*.registration \
- -m %{_datadir}/%{name}/*.mof \
- > /dev/null 2>&1 || :;
-fi;
+%sblim_post
%preun
-# Deregister only if not upgrading
-if [ $1 -eq 0 ]; then
- %{_datadir}/%{name}/provider-register.sh -d \
- -r %{_datadir}/%{name}/*.registration \
- -m %{_datadir}/%{name}/*.mof \
- > /dev/null 2>&1 || :;
-fi
+%sblim_preun
%postun -p /sbin/ldconfig
%changelog
+* Mon Mar 02 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.1-11
+- Update provider registration script to use systemctl to stop/start sfcb
+- Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list