From 3243ee94dd11f0d488b7b6d53353c0dc464c3f5e3998f559700ebaccdc362331 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 27 Mar 2020 05:03:39 +0000 Subject: [PATCH 1/3] Accepting request 787719 from home:pevik:branches:Base:System - Update nfs.conf - change value: udp=n (disabled in 2.2.1.) - update name: manage-gids - new: verbosity=0, rpc-verbosity=0, use-gss-proxy=0, rdma-port=20049, no-notify=0, force=0, lift-grace=y OBS-URL: https://build.opensuse.org/request/show/787719 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=217 --- nfs-utils.changes | 9 +++++++++ nfs.conf | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 45dc903..8c8ab63 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 24 10:13:53 UTC 2020 - Petr Vorel + +- Update nfs.conf + - change value: udp=n (disabled in 2.2.1.) + - update name: manage-gids + - new: verbosity=0, rpc-verbosity=0, use-gss-proxy=0, rdma-port=20049, + no-notify=0, force=0, lift-grace=y + ------------------------------------------------------------------- Mon Mar 9 10:04:10 UTC 2020 - Thorsten Kukuk diff --git a/nfs.conf b/nfs.conf index b3fd8fe..921cc5c 100644 --- a/nfs.conf +++ b/nfs.conf @@ -17,8 +17,11 @@ include = -/etc/nfs.conf.local # debug=0 # #[gssd] +# verbosity=0 +# rpc-verbosity=0 # use-memcache=0 # use-machine-creds=1 +# use-gss-proxy=0 avoid-dns=$NFS_GSSD_AVOID_DNS # limit-to-legacy-enctypes=0 # context-timeout=0 @@ -33,7 +36,7 @@ include = -/etc/nfs.conf.local # [mountd] # debug=0 -# manage_gids=n +# manage-gids=n # descriptors=0 port= $MOUNTD_PORT # threads=1 @@ -52,7 +55,7 @@ include = -/etc/nfs.conf.local # port=0 # grace-time=90 lease-time=$NFSV4LEASETIME -# udp=y +# udp=n # tcp=y # vers2=n vers3=$NFS3_SERVER_SUPPORT @@ -61,6 +64,7 @@ include = -/etc/nfs.conf.local # vers4.1=y # vers4.2=y # rdma=n +# rdma-port=20049 # [statd] # debug=0 @@ -69,12 +73,15 @@ include = -/etc/nfs.conf.local name=$STATD_HOSTNAME # state-directory-path=/var/lib/nfs/statd # ha-callout= +# no-notify=0 # #[sm-notify] # debug=0 +# force=0 # retry-time=900 # outgoing-port= # outgoing-addr= +# lift-grace=y # #[svcgssd] # principal= From bb3ce0cf2108e328c7da1399e0526e1f3d2ab2bedd0f49927180a5b385dcc07c Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 27 Mar 2020 05:07:49 +0000 Subject: [PATCH 2/3] - 0001-conffile-Don-t-give-warning-for-optional-config-file.patch Support optional include files correctly (boo#1164619) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=218 --- ...ive-warning-for-optional-config-file.patch | 33 +++++++++++++++++++ nfs-utils.changes | 7 ++++ nfs-utils.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 0001-conffile-Don-t-give-warning-for-optional-config-file.patch diff --git a/0001-conffile-Don-t-give-warning-for-optional-config-file.patch b/0001-conffile-Don-t-give-warning-for-optional-config-file.patch new file mode 100644 index 0000000..e96ff4a --- /dev/null +++ b/0001-conffile-Don-t-give-warning-for-optional-config-file.patch @@ -0,0 +1,33 @@ +From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Fri, 27 Mar 2020 15:58:24 +1100 +Subject: [PATCH] conffile: Don't give warning for optional config files. + +A recent commit added the possibility of optional config files for which +warning messages would be suppressed. +Unfortunately only one of the possible warning messages - the least +likely one - was suppressed. + +This patch suppresses the other. + +Fixes: c6fdcbe0a5cf ("conffile: allow optional include files") +Signed-off-by: NeilBrown +--- + support/nfs/conffile.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/support/nfs/conffile.c ++++ b/support/nfs/conffile.c +@@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, c + + subconf = conf_readfile(relpath); + if (subconf == NULL) { +- xlog_warn("config error at %s:%d: " +- "error loading included config", +- filename, lineno); ++ if (!optional) ++ xlog_warn("config error at %s:%d: error loading included config", ++ filename, lineno); + if (relpath) + free(relpath); + return; diff --git a/nfs-utils.changes b/nfs-utils.changes index 8c8ab63..a5fe4a9 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 27 05:06:12 UTC 2020 - Neil Brown + +- 0001-conffile-Don-t-give-warning-for-optional-config-file.patch + Support optional include files correctly + (boo#1164619) + ------------------------------------------------------------------- Tue Mar 24 10:13:53 UTC 2020 - Petr Vorel diff --git a/nfs-utils.spec b/nfs-utils.spec index 6ee40c3..140bfc9 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -46,6 +46,7 @@ Source25: rpc-svcgssd.options.conf Source26: nfs.conf Source27: nfs-kernel-server.tmpfiles.conf Patch0: nfs-utils-1.0.7-bind-syntax.patch +Patch1: 0001-conffile-Don-t-give-warning-for-optional-config-file.patch BuildRequires: e2fsprogs-devel BuildRequires: fedfs-utils-devel @@ -144,6 +145,7 @@ This package contains additional NFS documentation. %prep %setup -q -a 1 %patch0 -p1 +%patch1 -p1 cp %{SOURCE6} . From 034f8d4a5a36a144fdf18114190670e15b3ca2753fecbf1f3f034c0276349cd0 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 27 Mar 2020 05:30:43 +0000 Subject: [PATCH 3/3] - Improve the hack to avoid python dependencies. A new python script had been added since that hack was written. (boo#1166067) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=219 --- nfs-utils.changes | 7 +++++++ nfs-utils.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index a5fe4a9..79ab007 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 27 05:29:36 UTC 2020 - Neil Brown + +- Improve the hack to avoid python dependencies. + A new python script had been added since that hack was written. + (boo#1166067) + ------------------------------------------------------------------- Fri Mar 27 05:06:12 UTC 2020 - Neil Brown diff --git a/nfs-utils.spec b/nfs-utils.spec index 140bfc9..593a8bb 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -204,7 +204,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services install -m 644 utils/mount/nfsmount.conf %{buildroot}%{_sysconfdir}/nfsmount.conf # # hack to avoid automatic python dependency -chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat} +chmod 644 `grep -l -r '^#!/usr/bin/python' %{buildroot}%{_sbindir}` # Install sysusers.d template mkdir -p %{buildroot}%{_sysusersdir} install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/