53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 15f61f1842d76dcf15e506b2b4f755cace7d4b29 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:19:43 -0400
|
|
Subject: [PATCH 3/4] WRS: nfs-utils-spec-file-disable-statd-service.patch
|
|
|
|
Conflicts:
|
|
SPECS/nfs-utils.spec
|
|
---
|
|
SPECS/nfs-utils.spec | 13 ++++++++++---
|
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
|
|
index 1fecdba..8585c5d 100644
|
|
--- a/SPECS/nfs-utils.spec
|
|
+++ b/SPECS/nfs-utils.spec
|
|
@@ -451,6 +451,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/rpc.svcgssd
|
|
rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
|
|
rm $RPM_BUILD_ROOT%{_mandir}/man8/svcgssd.8
|
|
|
|
+# WRS - remove these service files as rpc-statd is started by nfscommon
|
|
+rm -f $RPM_BUILD_ROOT%{_unitdir}/rpc-statd.service
|
|
+rm -f $RPM_BUILD_ROOT%{_unitdir}/rpc-statd-notify.service
|
|
+
|
|
mkdir -p $RPM_BUILD_ROOT/run/sysconfig
|
|
mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/scripts
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
|
|
@@ -474,9 +478,6 @@ ln -s rpc-gssd.service nfs-secure.service
|
|
ln -s rpc-gssd.service rpcgssd.service
|
|
ln -s nfs-idmapd.service nfs-idmap.service
|
|
ln -s nfs-idmapd.service rpcidmapd.service
|
|
-ln -s rpc-statd.service nfs-lock.service
|
|
-ln -s rpc-statd.service nfslock.service
|
|
-
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
|
|
|
|
@@ -541,6 +542,12 @@ fi
|
|
%post
|
|
if [ $1 -eq 1 ] ; then
|
|
# Initial installation
|
|
+ if [ -f %{_unitdir}/rpc-statd.service ] ; then
|
|
+ rm -f %{_unitdir}/rpc-statd.service
|
|
+ fi
|
|
+ if [ -f %{_unitdir}/rpc-statd-notify.service ] ; then
|
|
+ rm -f %{_unitdir}/rpc-statd-notify.service
|
|
+ fi
|
|
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
|
|
/bin/systemctl restart nfs-config >/dev/null 2>&1 || :
|
|
|
|
--
|
|
1.9.1
|
|
|