d60afc72f7
Story: 2003389 Task: 24491 Change-Id: Iaae0db17a3ae20f741482372e49c87f85024e574 Signed-off-by: slin14 <shuicheng.lin@intel.com>
97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
From 535d4790b40ae2eaf9435ece40cf420165874877 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] WRS: 0001-TiS-nfs-utils-spec-add-scripts.patch
|
|
|
|
Conflicts:
|
|
SPECS/nfs-utils.spec
|
|
---
|
|
SPECS/nfs-utils.spec | 29 +++++++++++++++++++++++++++++
|
|
1 file changed, 29 insertions(+)
|
|
|
|
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
|
|
index 6dfddc0..282511e 100644
|
|
--- a/SPECS/nfs-utils.spec
|
|
+++ b/SPECS/nfs-utils.spec
|
|
@@ -15,6 +15,10 @@ Source2: nfs.sysconfig
|
|
Source3: nfs-utils_env.sh
|
|
Source4: lockd.conf
|
|
Source5: 24-nfs-server.conf
|
|
+Source10: nfscommon
|
|
+Source11: nfsserver
|
|
+Source12: nfscommon.service
|
|
+Source13: nfsserver.service
|
|
|
|
#
|
|
# RHEL7.1
|
|
@@ -145,6 +149,10 @@ Patch1001: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
|
Patch1002: nfs-utils-1.2.3-sm-notify-res_init.patch
|
|
Patch1003: nfs-utils-1.2.5-idmap-errmsg.patch
|
|
|
|
+# Titanium Cloud Patches
|
|
+Patch2000: nfs-utils-support-mountprog-and-nfsprog-options.patch
|
|
+Patch2001: nfs-utils-do-not-pass-CFLAGS-to-native.patch
|
|
+
|
|
Group: System Environment/Daemons
|
|
Provides: exportfs = %{epoch}:%{version}-%{release}
|
|
Provides: nfsstat = %{epoch}:%{version}-%{release}
|
|
@@ -418,6 +426,11 @@ This package also contains the mount.nfs and umount.nfs program.
|
|
%patch1002 -p1
|
|
%patch1003 -p1
|
|
|
|
+%patch2000 -p1
|
|
+# Titanium Cloud support mountprog and nfsprog options
|
|
+%patch2001 -p1
|
|
+# Titanium Cloud do not pass CFLAGS to native
|
|
+
|
|
# Remove .orig files
|
|
find . -name "*.orig" | xargs rm -f
|
|
|
|
@@ -479,6 +492,13 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env.
|
|
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
|
|
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
|
|
+install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/init.d/nfscommon
|
|
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d/nfsserver
|
|
+
|
|
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/nfscommon.service
|
|
+install -m 644 %{SOURCE13} $RPM_BUILD_ROOT/%{_unitdir}/nfsserver.service
|
|
+
|
|
#
|
|
# For backwards compatablity
|
|
#
|
|
@@ -557,6 +577,9 @@ if [ $1 -eq 1 ] ; then
|
|
# Initial installation
|
|
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
|
|
/bin/systemctl restart nfs-config >/dev/null 2>&1 || :
|
|
+
|
|
+ /bin/systemctl enable nfscommon.service >/dev/null 2>&1 || :
|
|
+ /bin/systemctl enable nfsserver.service >/dev/null 2>&1 || :
|
|
fi
|
|
%systemd_post nfs-config
|
|
%systemd_post nfs-server
|
|
@@ -568,6 +591,9 @@ chown -R rpcuser:rpcuser /var/lib/nfs/statd
|
|
if [ $1 -eq 0 ]; then
|
|
%systemd_preun nfs-client.target
|
|
%systemd_preun nfs-server.server
|
|
+
|
|
+ /bin/systemctl disable nfscommon.service >/dev/null 2>&1 || :
|
|
+ /bin/systemctl disable nfsserver.service >/dev/null 2>&1 || :
|
|
|
|
/usr/sbin/userdel rpcuser 2>/dev/null || :
|
|
/usr/sbin/groupdel rpcuser 2>/dev/null || :
|
|
@@ -654,6 +680,9 @@ fi
|
|
%{_sbindir}/nfsdcltrack
|
|
%{_mandir}/*/*
|
|
%{_unitdir}/*
|
|
+%attr(755,root,root) /etc/init.d/nfscommon
|
|
+%attr(755,root,root) /etc/init.d/nfsserver
|
|
+
|
|
%attr(755,root,root) /usr/lib/systemd/scripts/nfs-utils_env.sh
|
|
%{_prefix}/lib/systemd/system-generators/nfs-server-generator
|
|
%{_prefix}/lib/systemd/system-generators/rpc-pipefs-generator
|
|
--
|
|
2.7.4
|
|
|