starlingx/integ
Code Issues Proposed changes

Merge "refactor nfs-utils"

Browse Source
This commit is contained in:
Zuul 2018-12-05 23:04:21 +00:00 committed by Gerrit Code Review
commit d910ac0dc6
14 changed files with 17 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centos_iso_image.inc
View File

@ -176,8 +176,7 @@ nss-pam-ldapd
# centos-release-config
centos-release-config
# nfs-utils
nfs-utils
# nfs-utils series package
nfs-utils-config
# dhcp

1
centos_pkg_dirs
View File

@ -5,7 +5,6 @@ base/setup-config
base/setup
utilities/namespace-utils
base/centos-release-config
filesystem/nfs-utils
filesystem/nfs-utils-config
base/dhcp
base/dhcp-config

18
filesystem/nfs-utils-config/centos/nfs-utils-config.spec
View File

@ -36,8 +36,22 @@ if [ $1 -eq 1 ] ; then
cp -f %{_datadir}/starlingx/stx.nfsmount.conf %{_sysconfdir}/nfsmount.conf
chmod 644 %{_sysconfdir}/nfsmount.conf
fi
/bin/systemctl enable nfscommon.service >/dev/null 2>&1 || :
/bin/systemctl enable nfsserver.service >/dev/null 2>&1 || :
# STX - disable these service files as rpc-statd is started by nfscommon
%{_bindir}/systemctl disable rpc-statd.service
%{_bindir}/systemctl disable rpc-statd-notify.service
%{_bindir}/systemctl disable nfs-lock.service
%{_bindir}/systemctl disable nfslock.service
%{_bindir}/systemctl enable nfscommon.service >/dev/null 2>&1 || :
%{_bindir}/systemctl enable nfsserver.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ]; then
# pre uninstall
%{_bindir}/systemctl disable nfscommon.service >/dev/null 2>&1 || :
%{_bindir}/systemctl disable nfsserver.service >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)

2
filesystem/nfs-utils/centos/build_srpm.data
View File

@ -1,2 +0,0 @@
COPY_LIST="files/*"
TIS_PATCH_VER=4

33
filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,33 +0,0 @@
From 182dd62962039d383c96d7a50779aefb62cac9a0 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 15 Oct 2018 23:17:14 +0800
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
---
SPECS/nfs-utils.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index d10c87c..b866788 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.3.0
-Release: 0.54%{?dist}
+Release: 0.54.el7%{?_tis_dist}.%{tis_patch_ver}
Epoch: 1
# group all 32bit related archs
@@ -155,6 +155,7 @@ Provides: rpc.mountd = %{epoch}:%{version}-%{release}
Provides: rpc.nfsd = %{epoch}:%{version}-%{release}
Provides: rpc.statd = %{epoch}:%{version}-%{release}
Provides: rpc.gssd = %{epoch}:%{version}-%{release}
+Provides: rpc.svcgssd = %{epoch}:%{version}-%{release}
Provides: mount.nfs = %{epoch}:%{version}-%{release}
Provides: mount.nfs4 = %{epoch}:%{version}-%{release}
Provides: umount.nfs = %{epoch}:%{version}-%{release}
--
2.7.4

33
filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch
View File

@ -1,33 +0,0 @@
From feb40bdf71992f9374e82aeb081431d2b91f1224 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Mon, 15 Oct 2018 23:21:15 +0800
Subject: [PATCH] add-rpm-4.14-compatibility
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/nfs-utils.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index b866788..96fce13 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -610,14 +610,7 @@ if [ -h /etc/systemd/system/multi-user.target.wants/nfs.target ]; then
fi
fi
-%triggerun -- nfs-utils < 1:1.2.9-0.5
-/bin/systemctl stop nfs-secure.service >/dev/null 2>&1 || :
-/bin/systemctl disable nfs-secure.service >/dev/null 2>&1 || :
-
-%triggerun -- nfs-utils < 1:1.2.4-2
-/bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || :
-
-%triggerin -- nfs-utils > 1:1.3.0-0.39
+%triggerin -- nfs-utils
# reset configuration files and running daemons
if [ $1 -eq 2 ] ; then
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
--
2.7.4

4
filesystem/nfs-utils/centos/meta_patches/PATCH_ORDER
View File

@ -1,4 +0,0 @@
spec-include-TiS-changes.patch
nfs-utils-spec-file-disable-statd-service.patch
0001-Update-package-versioning-for-TIS-format.patch
0001-add-rpm-4.14-compatibility.patch

50
filesystem/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch
View File

@ -1,50 +0,0 @@
From 81d1abb89facf77ad3b1fade4384ccf3b0482eb3 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 15 Oct 2018 23:14:20 +0800
Subject: WRS: nfs-utils-spec-file-disable-statd-service.patch
---
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 0a5e9fb..d10c87c 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -472,6 +472,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
@@ -488,9 +492,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
@@ -555,6 +556,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 || :
fi
--
2.7.4

26
filesystem/nfs-utils/centos/meta_patches/spec-include-TiS-changes.patch
View File

@ -1,26 +0,0 @@
From 68ed40412a6a5caa0474715363a06914819b50bf Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 15 Oct 2018 22:50:46 +0800
Subject: [PATCH] WRS: spec-include-TiS-changes.patch
---
SPECS/nfs-utils.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index 6dfddc0..0a5e9fb 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec
@@ -569,6 +569,9 @@ 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 || :
/usr/sbin/userdel nfsnobody 2>/dev/null || :
--
2.7.4

1
filesystem/nfs-utils/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/nfs-utils-1.3.0-0.54.el7.src.rpm

11
filesystem/nfs-utils/files/nfs-mountd.service
View File

@ -1,11 +0,0 @@
[Unit]
Description=NFS Mount Daemon
After=rpcbind.service nfs-server.service
Requires=rpcbind.service nfs-server.service
[Service]
EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
ExecStart=@SBINDIR@/rpc.mountd -F $MOUNTD_OPTS
[Install]
WantedBy=multi-user.target

18
filesystem/nfs-utils/files/nfs-server.service
View File

@ -1,18 +0,0 @@
[Unit]
Description=NFS Server
Requires=rpcbind.service nfs-mountd.service
After=rpcbind.service
[Service]
Type=oneshot
EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
ExecStartPre=@SBINDIR@/exportfs -r
ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
ExecStop=@SBINDIR@/rpc.nfsd 0
ExecStopPost=@SBINDIR@/exportfs -f
ExecReload=@SBINDIR@/exportfs -r
StandardError=syslog
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

12
filesystem/nfs-utils/files/nfs-statd.service
View File

@ -1,12 +0,0 @@
[Unit]
Description=NFS file locking service
After=rpcbind.service
Requires=rpcbind.service
Before=remote-fs-pre.target
[Service]
EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
ExecStart=@SBINDIR@/rpc.statd -F $STATD_OPTS
[Install]
WantedBy=multi-user.target

35
filesystem/nfs-utils/files/nfs-utils.conf
View File

@ -1,35 +0,0 @@
# Parameters to be passed to nfs-utils (clients & server) service files.
#
# Options to pass to rpc.nfsd.
NFSD_OPTS=""
# Number of servers to start up; the default is 8 servers.
NFSD_COUNT=""
# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
PROCNFSD_MOUNTPOINT=""
# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
PROCNFSD_MOUNTOPTS=""
# Options for rpc.mountd.
# If you have a port-based firewall, you might want to set up
# a fixed port here using the --port option.
MOUNTD_OPTS=""
# Parameters to be passed to nfs-common (nfs clients & server) init script.
#
# If you do not set values for the NEED_ options, they will be attempted
# autodetected; this should be sufficient for most people. Valid alternatives
# for the NEED_ options are "yes" and "no".
# Do you want to start the statd daemon? It is not needed for NFSv4.
NEED_STATD=""
# Options to pass to rpc.statd.
# N.B. statd normally runs on both client and server, and run-time
# options should be specified accordingly.
# STATD_OPTS="-p 32765 -o 32766"
STATD_OPTS=""