From aa0564cfdd9802a9656f6468027ca2d3a1058bf3 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sat, 11 Jan 2020 14:37:51 +0800 Subject: [PATCH 1/3] Repackage --- ...nfs-utils-1.2.1-exp-subtree-warn-off.patch | 12 -- 0002-nfs-utils-1.2.5-idmap-errmsg.patch | 12 -- 0003-nfs-utils-2.1.1-nfs-config.patch | 203 ------------------ ...utils-2.3.1-systemd-gssproxy-restart.patch | 11 - 24-nfs-server.conf | 7 - ...> 9001-correct-the-statd-path-in-man.patch | 30 ++- id_resolver.conf | 9 - lockd.conf | 23 -- nfs-utils.spec | 35 +-- nfs-utils_env.sh | 45 ---- nfs.sysconfig | 38 ---- 11 files changed, 32 insertions(+), 393 deletions(-) delete mode 100644 0001-nfs-utils-1.2.1-exp-subtree-warn-off.patch delete mode 100644 0002-nfs-utils-1.2.5-idmap-errmsg.patch delete mode 100644 0003-nfs-utils-2.1.1-nfs-config.patch delete mode 100644 0004-nfs-utils-2.3.1-systemd-gssproxy-restart.patch delete mode 100644 24-nfs-server.conf rename 0000-nfs-utils-1.2.1-statdpath-man.patch => 9001-correct-the-statd-path-in-man.patch (59%) delete mode 100644 id_resolver.conf delete mode 100644 lockd.conf delete mode 100644 nfs-utils_env.sh delete mode 100644 nfs.sysconfig diff --git a/0001-nfs-utils-1.2.1-exp-subtree-warn-off.patch b/0001-nfs-utils-1.2.1-exp-subtree-warn-off.patch deleted file mode 100644 index 7708750..0000000 --- a/0001-nfs-utils-1.2.1-exp-subtree-warn-off.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nfs-utils-2.1.1/support/nfs/exports.c.orig nfs-utils-2.1.1/support/nfs/exports.c ---- nfs-utils-2.1.1/support/nfs/exports.c.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/support/nfs/exports.c 2017-04-26 12:46:24.186480312 -0400 -@@ -507,7 +507,7 @@ void fix_pseudoflavor_flags(struct expor - static int - parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr) - { -- int had_subtree_opt = 0; -+ int had_subtree_opt = 1; - char *flname = efname?efname:"command line"; - int flline = efp?efp->x_line:0; - unsigned int active = 0; diff --git a/0002-nfs-utils-1.2.5-idmap-errmsg.patch b/0002-nfs-utils-1.2.5-idmap-errmsg.patch deleted file mode 100644 index edaacb7..0000000 --- a/0002-nfs-utils-1.2.5-idmap-errmsg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c ---- nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/utils/nfsidmap/nfsidmap.c 2017-04-26 12:47:56.715133443 -0400 -@@ -432,7 +432,7 @@ int main(int argc, char **argv) - - xlog_stderr(verbose); - if ((argc - optind) != 2) { -- xlog_warn("Bad arg count. Check /etc/request-key.conf"); -+ xlog_err("Bad arg count. Check /etc/request-key.d/request-key.conf"); - xlog_warn(usage, progname); - return EXIT_FAILURE; - } diff --git a/0003-nfs-utils-2.1.1-nfs-config.patch b/0003-nfs-utils-2.1.1-nfs-config.patch deleted file mode 100644 index 2eb0fb1..0000000 --- a/0003-nfs-utils-2.1.1-nfs-config.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -up nfs-utils-2.2.1/configure.ac.orig nfs-utils-2.2.1/configure.ac ---- nfs-utils-2.2.1/configure.ac.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/configure.ac 2017-10-25 15:52:43.287511759 -0400 -@@ -552,6 +552,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) - # Make sure that $ACLOCAL_FLAGS are used during a rebuild - AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) - -+# make libexecdir available for substituion in config files -+# 2 "evals" needed late to expand variable names. -+AC_SUBST([_libexecdir]) -+AC_CONFIG_COMMANDS_PRE([eval eval _libexecdir=$libexecdir]) -+ - # make _sysconfdir available for substituion in config files - # 2 "evals" needed late to expand variable names. - AC_SUBST([_sysconfdir]) -@@ -559,6 +564,7 @@ AC_CONFIG_COMMANDS_PRE([eval eval _sysco - - AC_CONFIG_FILES([ - Makefile -+ systemd/nfs-config.service - systemd/rpc-gssd.service - linux-nfs/Makefile - support/Makefile -diff -up nfs-utils-2.2.1/systemd/Makefile.am.orig nfs-utils-2.2.1/systemd/Makefile.am ---- nfs-utils-2.2.1/systemd/Makefile.am.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/Makefile.am 2017-10-25 15:52:43.287511759 -0400 -@@ -6,6 +6,7 @@ unit_files = \ - nfs-client.target \ - rpc_pipefs.target \ - \ -+ nfs-config.service \ - nfs-mountd.service \ - nfs-server.service \ - nfs-utils.service \ -diff -up nfs-utils-2.2.1/systemd/nfs-blkmap.service.orig nfs-utils-2.2.1/systemd/nfs-blkmap.service ---- nfs-utils-2.2.1/systemd/nfs-blkmap.service.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/nfs-blkmap.service 2017-10-25 15:52:43.288511762 -0400 -@@ -10,7 +10,8 @@ PartOf=nfs-utils.service - [Service] - Type=forking - PIDFile=/var/run/blkmapd.pid --ExecStart=/usr/sbin/blkmapd -+EnvironmentFile=-/run/sysconfig/nfs-utils -+ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS - - [Install] - WantedBy=nfs-client.target -diff -up nfs-utils-2.2.1/systemd/nfs-config.service.in.orig nfs-utils-2.2.1/systemd/nfs-config.service.in ---- nfs-utils-2.2.1/systemd/nfs-config.service.in.orig 2017-10-25 15:52:43.288511762 -0400 -+++ nfs-utils-2.2.1/systemd/nfs-config.service.in 2017-10-25 15:52:43.288511762 -0400 -@@ -0,0 +1,13 @@ -+[Unit] -+Description=Preprocess NFS configuration -+After=local-fs.target -+DefaultDependencies=no -+ -+[Service] -+Type=oneshot -+# This service needs to run any time any nfs service -+# is started, so changes to local config files get -+# incorporated. Having "RemainAfterExit=no" (the default) -+# ensures this happens. -+RemainAfterExit=no -+ExecStart=@_libexecdir@/nfs-utils/nfs-utils_env.sh -diff -up nfs-utils-2.2.1/systemd/nfs-idmapd.service.orig nfs-utils-2.2.1/systemd/nfs-idmapd.service ---- nfs-utils-2.2.1/systemd/nfs-idmapd.service.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/nfs-idmapd.service 2017-10-25 15:52:43.288511762 -0400 -@@ -6,6 +6,10 @@ After=rpc_pipefs.target local-fs.target - - BindsTo=nfs-server.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] -+EnvironmentFile=-/run/sysconfig/nfs-utils - Type=forking --ExecStart=/usr/sbin/rpc.idmapd -+ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS -diff -up nfs-utils-2.2.1/systemd/nfs-mountd.service.orig nfs-utils-2.2.1/systemd/nfs-mountd.service ---- nfs-utils-2.2.1/systemd/nfs-mountd.service.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/nfs-mountd.service 2017-10-25 15:52:43.289511766 -0400 -@@ -8,6 +8,10 @@ After=network-online.target local-fs.tar - After=rpcbind.socket - BindsTo=nfs-server.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] -+EnvironmentFile=-/run/sysconfig/nfs-utils - Type=forking --ExecStart=/usr/sbin/rpc.mountd -+ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS -diff -up nfs-utils-2.2.1/systemd/nfs-server.service.orig nfs-utils-2.2.1/systemd/nfs-server.service ---- nfs-utils-2.2.1/systemd/nfs-server.service.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/nfs-server.service 2017-10-25 15:52:43.289511766 -0400 -@@ -16,11 +16,16 @@ Before= rpc-statd-notify.service - Wants=auth-rpcgss-module.service - After=rpc-gssd.service gssproxy.service rpc-svcgssd.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] -+EnvironmentFile=-/run/sysconfig/nfs-utils -+ - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/usr/sbin/exportfs -r --ExecStart=/usr/sbin/rpc.nfsd -+ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS - ExecStop=/usr/sbin/rpc.nfsd 0 - ExecStopPost=/usr/sbin/exportfs -au - ExecStopPost=/usr/sbin/exportfs -f -diff -up nfs-utils-2.2.1/systemd/README.orig nfs-utils-2.2.1/systemd/README ---- nfs-utils-2.2.1/systemd/README.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/README 2017-10-25 15:52:43.289511766 -0400 -@@ -19,8 +19,8 @@ by a suitable 'preset' setting: - can work (if no type is given, ".service" is assumed). - - nfs-client.target -- If enabled, daemons needed for an nfs client are enabled. -- This does *not* include rpc.statd. The rpc-statd.service unit -+ If enabled, daemons needs for an nfs client are enabled. -+ This does *not* include rpc.statd. the rpc-statd.service unit - is started by /usr/sbin/start-statd which mount.nfs will run - if statd is needed. - -@@ -52,19 +52,11 @@ It cannot stop rpc.statd or rpc.gssd as - client and systemd cannot specify is two-pronged reverse dependency. - (i.e. stop this unit if none of these units are running) - --Distro specific configuration can be included in /etc/nfs.conf, or --by providing drop-in files which replace the ExecStart line for a given --service, and possibly add an EnvironmentFile line. -- --For example, if systemd/system/nfs-mountd.service.d/local.conf --contained -- [Service] -- EnvironmentFile=/etc/sysconfig/nfs -- ExecStart= -- ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDOPTS -- --then the setting of RPCMOUNTDOPTS in /etc/sysconfig/nfs would be --passed to rpc.mountd. -+Distro specific commandline configuration can be provided by -+installing a script /usr/libexec/nfs-utils/nfs-utils_env.sh -+This should write /run/sysconfig/nfs-utils based on configuration -+information such as in /etc/sysconfig/nfs or /etc/defaults/nfs. -+It is run once by nfs-config.service. - - rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab - is present. -diff -up nfs-utils-2.2.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.2.1/systemd/rpc-gssd.service.in ---- nfs-utils-2.2.1/systemd/rpc-gssd.service.in.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/rpc-gssd.service.in 2017-10-25 15:52:43.290511769 -0400 -@@ -9,6 +9,11 @@ ConditionPathExists=@_sysconfdir@/krb5.k - - PartOf=nfs-utils.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] -+EnvironmentFile=-/run/sysconfig/nfs-utils -+ - Type=forking --ExecStart=/usr/sbin/rpc.gssd -+ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS -diff -up nfs-utils-2.2.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.2.1/systemd/rpc-statd-notify.service ---- nfs-utils-2.2.1/systemd/rpc-statd-notify.service.orig 2017-10-25 15:52:43.290511769 -0400 -+++ nfs-utils-2.2.1/systemd/rpc-statd-notify.service 2017-10-25 15:56:28.102284921 -0400 -@@ -10,7 +10,11 @@ After=nfs-server.service - - PartOf=nfs-utils.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] - Type=forking --ExecStart=-/usr/sbin/sm-notify -+EnvironmentFile=-/run/sysconfig/nfs-utils -+ExecStart=-/usr/sbin/sm-notify $SMNOTIFYARGS - RemainAfterExit=yes -diff -up nfs-utils-2.2.1/systemd/rpc-statd.service.orig nfs-utils-2.2.1/systemd/rpc-statd.service ---- nfs-utils-2.2.1/systemd/rpc-statd.service.orig 2017-10-25 15:32:19.000000000 -0400 -+++ nfs-utils-2.2.1/systemd/rpc-statd.service 2017-10-25 15:52:43.291511772 -0400 -@@ -8,8 +8,12 @@ After=network-online.target nss-lookup.t - - PartOf=nfs-utils.service - -+Wants=nfs-config.service -+After=nfs-config.service -+ - [Service] - Environment=RPC_STATD_NO_NOTIFY=1 -+EnvironmentFile=-/run/sysconfig/nfs-utils - Type=forking - PIDFile=/var/run/rpc.statd.pid --ExecStart=/usr/sbin/rpc.statd -+ExecStart=/usr/sbin/rpc.statd $STATDARGS diff --git a/0004-nfs-utils-2.3.1-systemd-gssproxy-restart.patch b/0004-nfs-utils-2.3.1-systemd-gssproxy-restart.patch deleted file mode 100644 index 8f46e15..0000000 --- a/0004-nfs-utils-2.3.1-systemd-gssproxy-restart.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up nfs-utils-2.3.1/systemd/nfs-server.service.orig nfs-utils-2.3.1/systemd/nfs-server.service ---- nfs-utils-2.3.1/systemd/nfs-server.service.orig 2018-01-19 10:25:38.153513857 -0500 -+++ nfs-utils-2.3.1/systemd/nfs-server.service 2018-01-19 10:30:52.977245126 -0500 -@@ -26,6 +26,7 @@ Type=oneshot - RemainAfterExit=yes - ExecStartPre=/usr/sbin/exportfs -r - ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS -+ExecStart=-/bin/sh -c 'if systemctl -q is-active gssproxy; then systemctl restart gssproxy ; fi' - ExecStop=/usr/sbin/rpc.nfsd 0 - ExecStopPost=/usr/sbin/exportfs -au - ExecStopPost=/usr/sbin/exportfs -f diff --git a/24-nfs-server.conf b/24-nfs-server.conf deleted file mode 100644 index 5011e92..0000000 --- a/24-nfs-server.conf +++ /dev/null @@ -1,7 +0,0 @@ -[service/nfs-server] - mechs = krb5 - socket = /run/gssproxy.sock - cred_store = keytab:/etc/krb5.keytab - trusted = yes - kernel_nfsd = yes - euid = 0 diff --git a/0000-nfs-utils-1.2.1-statdpath-man.patch b/9001-correct-the-statd-path-in-man.patch similarity index 59% rename from 0000-nfs-utils-1.2.1-statdpath-man.patch rename to 9001-correct-the-statd-path-in-man.patch index 986a4b8..e816906 100644 --- a/0000-nfs-utils-1.2.1-statdpath-man.patch +++ b/9001-correct-the-statd-path-in-man.patch @@ -1,6 +1,18 @@ -diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/statd/sm-notify.man ---- nfs-utils-2.1.1/utils/statd/sm-notify.man.orig 2017-04-26 12:45:14.205742654 -0400 -+++ nfs-utils-2.1.1/utils/statd/sm-notify.man 2017-04-26 12:45:44.042630801 -0400 +From b4c60f47463d8cdd24a73e31b284a28efc8f2278 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Fri, 10 Jan 2020 03:07:48 +0000 +Subject: [PATCH] correct the statd path in man + +Signed-off-by: hy-euler +--- + utils/statd/sm-notify.man | 8 ++++---- + utils/statd/statd.man | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man +index cfe1e4b..4658d86 100644 +--- a/utils/statd/sm-notify.man ++++ b/utils/statd/sm-notify.man @@ -184,7 +184,7 @@ where NSM state information resides. If this option is not specified, .B sm-notify @@ -27,9 +39,10 @@ diff -up nfs-utils-2.1.1/utils/statd/sm-notify.man.orig nfs-utils-2.1.1/utils/st NSM state number for this host .TP 2.5i .I /proc/sys/fs/nfs/nsm_local_state -diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/statd.man ---- nfs-utils-2.1.1/utils/statd/statd.man.orig 2017-01-12 10:21:39.000000000 -0500 -+++ nfs-utils-2.1.1/utils/statd/statd.man 2017-04-26 12:45:44.043630798 -0400 +diff --git a/utils/statd/statd.man b/utils/statd/statd.man +index 71d5846..ad81490 100644 +--- a/utils/statd/statd.man ++++ b/utils/statd/statd.man @@ -253,7 +253,7 @@ where NSM state information resides. If this option is not specified, .B rpc.statd @@ -39,7 +52,7 @@ diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/ by default. .IP After starting, -@@ -425,13 +425,13 @@ If set to a positive integer, has the sa +@@ -425,13 +425,13 @@ If set to a positive integer, has the same effect as .IR \-\-no\-notify . .SH FILES .TP 2.5i @@ -56,3 +69,6 @@ diff -up nfs-utils-2.1.1/utils/statd/statd.man.orig nfs-utils-2.1.1/utils/statd/ NSM state number for this host .TP 2.5i .I /var/run/run.statd.pid +-- +1.7.12.4 + diff --git a/id_resolver.conf b/id_resolver.conf deleted file mode 100644 index 67ccb18..0000000 --- a/id_resolver.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# nfsidmap(5) - The NFS idmapper upcall program -# Summary: Used by NFSv4 to map user/group ids into -# user/group names and names into in ids -# Options: -# -v Increases the verbosity of the output to syslog -# -t timeout Set the expiration timer, in seconds, on the key -# -create id_resolver * * /usr/sbin/nfsidmap %k %d diff --git a/lockd.conf b/lockd.conf deleted file mode 100644 index f672d12..0000000 --- a/lockd.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Set the NFS lock manager grace period. n is measured in seconds. -#options lockd nlm_grace_period=90 -# -# Set the TCP port that the NFS lock manager should use. -# port must be a valid TCP port value (1-65535). -#options lockd nlm_tcpport -# -# Set the UDP port that the NFS lock manager should use. -# port must be a valid UDP port value (1-65535). -#options lockd nlm_udpport -# -# Set the maximum number of outstanding connections -#options lockd nlm_max_connections=1024 -# -# Set the default time value for the NFS lock manager -# in seconds. Default is 10 secs (min 3 max 20) -#options lockd nlm_timeout=10 -# -# Choose whether to record the caller_name or IP address -# this peer in the local rpc.statd's database. -#options lockd nsm_use_hostnames=0 - diff --git a/nfs-utils.spec b/nfs-utils.spec index 33c9011..45c1b73 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -4,24 +4,13 @@ Name: nfs-utils Version: 2.3.3 -Release: 5 +Release: 6 Epoch: 1 Summary: The Linux NFS userland utility package License: MIT and GPLv2 and GPLv2+ and BSD URL: http://sourceforge.net/projects/nfs/ Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz -Source1: id_resolver.conf -Source2: nfs.sysconfig -Source3: nfs-utils_env.sh -Source4: lockd.conf -Source5: 24-nfs-server.conf - -Patch0: 0000-nfs-utils-1.2.1-statdpath-man.patch -Patch1: 0001-nfs-utils-1.2.1-exp-subtree-warn-off.patch -Patch2: 0002-nfs-utils-1.2.5-idmap-errmsg.patch -Patch3: 0003-nfs-utils-2.1.1-nfs-config.patch -Patch4: 0004-nfs-utils-2.3.1-systemd-gssproxy-restart.patch Patch6000: 6000-bugfix-fail-disable-major-NFS-version-4.patch Patch6001: 6001-ignore-EBUSY-when-a-filesystem-is-already-mount.patch @@ -66,6 +55,7 @@ Patch6039: 6039-fix-e_hostname-and-e_uuid-leaks-in-rpc.mountd.patch Patch6040: 6040-donot-share-cache-file-descriptors-among-processes.patch Patch9000: 9000-systemd-idmapd-require-rpc-pipefs.patch +Patch9001: 9001-correct-the-statd-path-in-man.patch BuildRequires: libevent-devel,libcap-devel, libtirpc-devel libblkid-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 @@ -157,19 +147,12 @@ sh -x autogen.sh %make_install -install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d/id_resolver.conf -install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs - +install -D -m 644 utils/nfsidmap/id_resolver.conf $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d/id_resolver.conf install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir} install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT%{_sysconfdir} install -m 644 nfs.conf $RPM_BUILD_ROOT%{_sysconfdir} install -m 644 support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/nfs-utils_env.sh -install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf -install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy/24-nfs-server.conf - - touch $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rmtab mv $RPM_BUILD_ROOT%{_sbindir}/rpc.statd $RPM_BUILD_ROOT/sbin @@ -229,7 +212,6 @@ if [ $1 -eq 1 ] ; then /bin/systemctl start nfs-client.target &> /dev/null || : fi -%systemd_post nfs-config %systemd_post nfs-server /bin/systemctl try-restart gssproxy &> /dev/null || : @@ -249,26 +231,21 @@ fi %files %doc support/nfsidmap/AUTHORS linux-nfs/README linux-nfs/THANKS %license support/nfsidmap/COPYING -%config(noreplace) /etc/sysconfig/nfs %config(noreplace) /etc/nfsmount.conf %config(noreplace) %{_sharedstatedir}/nfs/etab %config(noreplace) %{_sharedstatedir}/nfs/rmtab %config(noreplace) %{_sysconfdir}/idmapd.conf %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf -%config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf %config(noreplace) %{_sysconfdir}/nfs.conf %dir %{_sysconfdir}/exports.d %dir %{_sharedstatedir}/nfs %dir %{_sharedstatedir}/nfs/v4recovery %dir %{_sharedstatedir}/nfs/rpc_pipefs -%dir %{_libexecdir}/nfs-utils %dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd %dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm %dir %attr(700,rpcuser,rpcuser) %{_sharedstatedir}/nfs/statd/sm.bak %ghost %attr(644,rpcuser,rpcuser) %{_statdpath}/state -%attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/24-nfs-server.conf %attr(4755,root,root) /sbin/mount.nfs -%attr(755,root,root) %{_libexecdir}/nfs-utils/nfs-utils_env.sh /sbin/{rpc.statd,nfsdcltrack,osd_login,mount.nfs4,umount.*} %{_sbindir}/* %{_prefix}/lib/systemd/*/* @@ -285,6 +262,12 @@ fi %{_mandir}/*/* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 2.3.3-6 +- Type:enhancemnet +- ID:NA +- SUG:NA +- DESC:Repackage + * Sun Dec 29 2019 openEuler Buildteam - 2.3.3-5 - Type:bugfix - ID:NA diff --git a/nfs-utils_env.sh b/nfs-utils_env.sh deleted file mode 100644 index dd3782b..0000000 --- a/nfs-utils_env.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -# -# Extract configuration from /etc/sysconfig/nfs and write -# environment variables to /run/sysconfig/nfs-utils to be -# used by systemd nfs-config service -# - -nfs_config=/etc/sysconfig/nfs -if test -r $nfs_config; then - . $nfs_config -fi - -if [ -n "$NFSD_V4_GRACE" ]; then - grace="-G $NFSD_V4_GRACE" -fi - -if [ -n "$NFSD_V4_LEASE" ]; then - lease="-L $NFSD_V4_LEASE" -fi - -if [ -n "$RPCNFSDCOUNT" ]; then - nfsds=$RPCNFSDCOUNT -else - nfsds=8 -fi - -if [ -n "$RPCNFSDARGS" ]; then - nfsdargs="$RPCNFSDARGS $grace $lease $nfsds" -else - nfsdargs="$grace $lease $nfsds" -fi - -mkdir -p /run/sysconfig -{ -echo RPCNFSDARGS=\"$nfsdargs\" -echo RPCMOUNTDARGS=\"$RPCMOUNTDOPTS\" -echo STATDARGS=\"$STATDARGS\" -echo SMNOTIFYARGS=\"$SMNOTIFYARGS\" -echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\" -echo RPCGSSDARGS=\"$RPCGSSDARGS\" -echo RPCSVCGSSDARGS=\"$RPCSVCGSSDARGS\" -echo BLKMAPDARGS=\"$BLKMAPDARGS\" -echo GSS_USE_PROXY=\"$GSS_USE_PROXY\" -} > /run/sysconfig/nfs-utils diff --git a/nfs.sysconfig b/nfs.sysconfig deleted file mode 100644 index 04b9867..0000000 --- a/nfs.sysconfig +++ /dev/null @@ -1,38 +0,0 @@ - -# -# -# To set lockd kernel module parameters please see -# /etc/modprobe.d/lockd.conf -# -# -# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) -RPCNFSDARGS="" -# Number of nfs server processes to be started. -# The default is 8. -# RPCNFSDCOUNT=16 -# -# Set V4 grace period in seconds -#NFSD_V4_GRACE=90 -# -# Set V4 lease period in seconds -#NFSD_V4_LEASE=90 -# -# Optional arguments passed to rpc.mountd. See rpc.mountd(8) -RPCMOUNTDOPTS="" -# -# Optional arguments passed to rpc.statd. See rpc.statd(8) -STATDARGS="" -# Optional arguments passed to sm-notify. See sm-notify(8) -SMNOTIFYARGS="" -# -# -# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) -RPCIDMAPDARGS="" -# -# Optional arguments passed to rpc.gssd. See rpc.gssd(8) -RPCGSSDARGS="" -# Enable usage of gssproxy. See gssproxy-mech(8). -GSS_USE_PROXY="yes" -# -# Optional arguments passed to blkmapd. See blkmapd(8) -BLKMAPDARGS="" -- Gitee From be1d1036d107b59ce92a00192cbc7a5d98781402 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sat, 11 Jan 2020 15:18:51 +0800 Subject: [PATCH 2/3] Repackage --- nfs-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 45c1b73..2090354 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -277,5 +277,5 @@ fi * Sun Sep 29 2019 zhanghaibo - 2.3.3-4 - Remove some comments -* Tue Sep 05 2019 openEuler Buildteam - 2.3.3-3 +* Thu Sep 05 2019 openEuler Buildteam - 2.3.3-3 - Package init -- Gitee From cdf946d314316f599982efd84504e1e528ba94f2 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sat, 11 Jan 2020 15:28:27 +0800 Subject: [PATCH 3/3] Repackage --- 6005-add-IgnoreOnIsolate-yes-in-rpc-statd-service.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/6005-add-IgnoreOnIsolate-yes-in-rpc-statd-service.patch b/6005-add-IgnoreOnIsolate-yes-in-rpc-statd-service.patch index c343ddf..73b3a09 100644 --- a/6005-add-IgnoreOnIsolate-yes-in-rpc-statd-service.patch +++ b/6005-add-IgnoreOnIsolate-yes-in-rpc-statd-service.patch @@ -18,8 +18,8 @@ index 1ed60a8..7cd78ec 100644 PartOf=nfs-utils.service +IgnoreOnIsolate=yes - Wants=nfs-config.service - After=nfs-config.service + [Service] + Environment=RPC_STATD_NO_NOTIFY=1 diff --git a/utils/statd/start-statd b/utils/statd/start-statd index 82715b4..54ced82 100755 --- a/utils/statd/start-statd -- Gitee