Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2017-02-16 16:41:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2017-02-07
11:57:51.585282903 +0100
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2017-02-16
16:41:49.345482078 +0100
@@ -1,0 +2,28 @@
+Wed Feb 8 02:32:37 UTC 2017 - nfbr...@suse.com
+
+- update upstream version from 1.3.4 to 2.1.1
+ The significant update is that configuration can
+ now be read from a central /etc/nfs.conf file, and
+ it can include other files such as /etc/sysconfig/nfs
+ This means that the old nfs-config.service systemd
+ unit is no longer needed.
+- /etc/nfs.conf file created to import all sysconfig
+ settings except *_OPTIONS directly into running code.
+- dropins created to pass *_OPTIONS sysconfig setting to
+ the various daemons.
+- various specfile improvements, such as using "-D" in
+ "install" commands, and adding "verify_permissions".
+- "xtab" has not been needed for years and has now been remove.
+- sysconfig.nfs updated, particular the ServiceRestart
+ declarations have been tuned for systemd units.
+- 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
+ Fix the nfs-server-generator so that mounts marked "noauto"
+ are not automatically mounted when NFS exported.
+ (bsc#1019211)
+- 0001-conffile-ignore-empty-environment-variables.patch
+ 0002-mount-call-setgroups-before-setuid.patch
+ Other minor fixes found during testing.
+- REMOVED 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
+ now included upstream
+
+-------------------------------------------------------------------
Old:
----
0001-Make-location-of-nfs-utils_env.sh-configurable.patch
nfs-config.restart.conf
nfs-utils-1.3.4.tar.xz
nfs-utils_env.sh
New:
----
0001-conffile-ignore-empty-environment-variables.patch
0002-mount-call-setgroups-before-setuid.patch
0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
nfs-mountd.options.conf
nfs-server.options.conf
nfs-utils-2.1.1.tar.xz
nfs.conf
rpc-gssd.options.conf
rpc-statd-notify.options.conf
rpc-statd.options.conf
rpc-svcgssd.options.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfs-utils.spec ++++++
--- /var/tmp/diff_new_pack.XdWKKQ/_old 2017-02-16 16:41:50.781278169 +0100
+++ /var/tmp/diff_new_pack.XdWKKQ/_new 2017-02-16 16:41:50.785277601 +0100
@@ -17,7 +17,7 @@
Name: nfs-utils
-Version: 1.3.4
+Version: 2.1.1
Release: 0
Summary: Support Utilities for Kernel nfsd
License: GPL-2.0+
@@ -32,15 +32,23 @@
Source7: fw-client
Source8: fw-server
Source11: idmapd.conf
-Source12: nfs-config.restart.conf
Source13: nfs-utils.rpmlintrc
-Source14: nfs-utils_env.sh
Source15: nfsserver.service
Source16: nfs.service
Source17: nfs-server.nfsserver.conf
Source18: nfs-client.nfs.conf
+Source20: nfs-mountd.options.conf
+Source21: nfs-server.options.conf
+Source22: rpc-gssd.options.conf
+Source23: rpc-statd.options.conf
+Source24: rpc-statd-notify.options.conf
+Source25: rpc-svcgssd.options.conf
+Source26: nfs.conf
Patch0: nfs-utils-1.0.7-bind-syntax.patch
-Patch1: 0001-Make-location-of-nfs-utils_env.sh-configurable.patch
+Patch1: 0001-conffile-ignore-empty-environment-variables.patch
+Patch2: 0002-mount-call-setgroups-before-setuid.patch
+Patch3: 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
+
BuildRequires: e2fsprogs-devel
BuildRequires: fedfs-utils-devel
BuildRequires: gcc-c++
@@ -89,6 +97,7 @@
Conflicts: nfs-server
Provides: nfs-utils = %{version}
Obsoletes: nfs-utils < 1.1.0
+PreReq: permissions
%description -n nfs-kernel-server
This package contains support for the kernel based NFS server. You can
@@ -109,6 +118,8 @@
%setup -q -a 1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp %{SOURCE6} .
@@ -138,17 +149,17 @@
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
-install -d %{buildroot}/%{_unitdir}
-install -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/nfsserver.service
-install -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/nfs.service
-install -d %{buildroot}%{_unitdir}/nfs-server.service.d
-install -m 644 %{SOURCE17}
%{buildroot}%{_unitdir}/nfs-server.service.d/nfsserver.conf
-install -d %{buildroot}%{_unitdir}/nfs-client.target.d
-install -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/nfs-client.target.d/nfs.conf
-install -d %{buildroot}%{_libexecdir}/nfs-utils
-install -m 755 %{SOURCE14}
%{buildroot}%{_libexecdir}/nfs-utils/nfs-utils_env.sh
-install -d %{buildroot}%{_unitdir}/nfs-config.service.d
-install -m 644 %{SOURCE12}
%{buildroot}%{_unitdir}/nfs-config.service.d/restart.conf
+install -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/nfsserver.service
+install -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/nfs.service
+install -D -m 644 %{SOURCE17}
%{buildroot}%{_unitdir}/nfs-server.service.d/nfsserver.conf
+install -D -m 644 %{SOURCE18}
%{buildroot}%{_unitdir}/nfs-client.target.d/nfs.conf
+install -D -m 644 %{SOURCE20}
%{buildroot}%{_unitdir}/nfs-mountd.service.d/options.conf
+install -D -m 644 %{SOURCE21}
%{buildroot}%{_unitdir}/nfs-server.service.d/options.conf
+install -D -m 644 %{SOURCE22}
%{buildroot}%{_unitdir}/rpc-gssd.service.d/options.conf
+install -D -m 644 %{SOURCE23}
%{buildroot}%{_unitdir}/rpc-statd.service.d/options.conf
+install -D -m 644 %{SOURCE24}
%{buildroot}%{_unitdir}/rpc-statd-notify.service.d/options.conf
+install -D -m 644 %{SOURCE25}
%{buildroot}%{_unitdir}/rpc-svcgssd.service.d/options.conf
+install -D -m 644 %{SOURCE26} %{buildroot}%{_sysconfdir}/nfs.conf
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfsserver
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs
@@ -157,8 +168,7 @@
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates
# idmapd setup
-install -d %{buildroot}/etc
-install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/idmapd.conf
+install -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/idmapd.conf
mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/rpc_pipefs
mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/v4recovery
# sm-notify state
@@ -177,7 +187,7 @@
/usr/bin/getent passwd statd >/dev/null || \
/usr/sbin/useradd -r -c 'NFS statd daemon' \
-s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd
-%service_add_pre nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
+%service_add_pre nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%post -n nfs-client
chown statd:nogroup %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
@@ -196,13 +206,13 @@
%{fillup_only -n nfs nfs}
#
%set_permissions /sbin/mount.nfs
-%service_add_post nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
+%service_add_post nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%preun -n nfs-client
-%service_del_preun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
+%service_del_preun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%postun -n nfs-client
-%service_del_postun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
nfs-config.service
+%service_del_postun nfs.service auth-rpcgss-module.service nfs-idmapd.service
nfs-blkmap.service rpc-statd-notify.service rpc-gssd.service rpc-statd.service
rpc-svcgssd.service
%verifyscript -n nfs-client
%verify_permissions -e /sbin/mount.nfs
@@ -223,15 +233,20 @@
mv %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd /run/nfs
fi
###
-%service_add_post nfsserver.service rpc-svcgssd.service nfs-mountd.service
nfs-server.service
+%service_add_post nfsserver.service nfs-mountd.service nfs-server.service
+%set_permissions /var/lib/nfs/rmtab
%postun -n nfs-kernel-server
-%service_del_postun nfsserver.service rpc-svcgssd.service nfs-mountd.service
nfs-server.service
+%service_del_postun nfsserver.service nfs-mountd.service nfs-server.service
+
+%verifyscript -n nfs-kernel-server
+%verify_permissions -e /var/lib/nfs/rmtab
%files -n nfs-client
%defattr(-,root,root)
%config %{_sysconfdir}/idmapd.conf
%config %{_sysconfdir}/nfsmount.conf
+%config %{_sysconfdir}/nfs.conf
%verify(not mode) %attr(0755,root,root) /sbin/mount.nfs
/sbin/mount.nfs4
/sbin/umount.nfs
@@ -255,23 +270,30 @@
%{_unitdir}/auth-rpcgss-module.service
%{_unitdir}/nfs-blkmap.service
%{_unitdir}/nfs-client.target
-%{_unitdir}/nfs-config.service
%{_unitdir}/nfs-idmapd.service
%{_unitdir}/nfs-utils.service
%{_unitdir}/rpc-gssd.service
+%{_unitdir}/rpc-gssd.service.d
+%{_unitdir}/rpc-gssd.service.d/options.conf
%{_unitdir}/rpc-statd-notify.service
+%{_unitdir}/rpc-statd-notify.service.d
+%{_unitdir}/rpc-statd-notify.service.d/options.conf
%{_unitdir}/rpc-statd.service
+%{_unitdir}/rpc-statd.service.d
+%{_unitdir}/rpc-statd.service.d/options.conf
%{_unitdir}/rpc-svcgssd.service
+%{_unitdir}/rpc-svcgssd.service.d
+%{_unitdir}/rpc-svcgssd.service.d/options.conf
%{_unitdir}/var-lib-nfs-rpc_pipefs.mount
%{_unitdir}/nfs.service
%dir %{_unitdir}/nfs-client.target.d
%{_unitdir}/nfs-client.target.d/nfs.conf
-%dir %{_unitdir}/nfs-config.service.d
-%{_unitdir}/nfs-config.service.d/restart.conf
-%dir %{_libexecdir}/nfs-utils
-%{_libexecdir}/nfs-utils/nfs-utils_env.sh
+%dir /usr/lib/systemd/system-generators
+/usr/lib/systemd/system-generators/nfs-server-generator
%{_mandir}/man5/nfsmount.conf.5%{ext_man}
+%{_mandir}/man5/nfs.conf.5%{ext_man}
%{_mandir}/man5/nfs.5%{ext_man}
+%{_mandir}/man7/nfs.systemd.7%{ext_man}
%{_mandir}/man8/mount.nfs.8%{ext_man}
%{_mandir}/man8/nfsidmap.8%{ext_man}
%{_mandir}/man8/nfsstat.8%{ext_man}
@@ -303,10 +325,13 @@
%files -n nfs-kernel-server
%defattr(-,root,root)
%{_unitdir}/nfs-mountd.service
+%{_unitdir}/nfs-mountd.service.d
+%{_unitdir}/nfs-mountd.service.d/options.conf
%{_unitdir}/nfs-server.service
+%{_unitdir}/nfs-server.service.d
+%{_unitdir}/nfs-server.service.d/options.conf
%{_unitdir}/proc-fs-nfsd.mount
%{_unitdir}/nfsserver.service
-%dir %{_unitdir}/nfs-server.service.d
%{_unitdir}/nfs-server.service.d/nfsserver.conf
%{_sbindir}/exportfs
%{_sbindir}/rcnfsserver
@@ -322,7 +347,6 @@
%{_mandir}/man8/rpc.mountd.8%{ext_man}
%{_mandir}/man8/rpc.nfsd.8%{ext_man}
%{_mandir}/man8/nfsdcltrack.8%{ext_man}
-%config(noreplace) %{_localstatedir}/lib/nfs/xtab
%config(noreplace) %{_localstatedir}/lib/nfs/etab
%config(noreplace) %{_localstatedir}/lib/nfs/rmtab
%config %attr(0644,root,root)
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
++++++ 0001-conffile-ignore-empty-environment-variables.patch ++++++
>From 5ec9d9034650ae4372dc1bd44d33a1e8768e3409 Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@suse.com>
Date: Wed, 8 Feb 2017 08:18:34 +1100
Subject: [PATCH] conffile: ignore empty environment variables.
conf_set() already refuses to set an empty value, so if
foo=
appear in the config file, it will be ignored.
This patch extends the policy to environment variables, so empty
environment variables are treats as though they didn't exist.
This means that a separate environment file (e.g. /etc/sysconfig/nfs)
will be treated the same way whether it is:
- included in the [environment] section of /etc/nfs.conf
- sourced by the shell before running code
- sourced by the systemd EnvironmentFile directive.
Signed-off-by: NeilBrown <ne...@suse.com>
---
support/nfs/conffile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index e717c1e39bab..203efd2aa602 100644
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -533,7 +533,7 @@ retry:
* or from environment
*/
char *env = getenv(cb->value+1);
- if (env)
+ if (env && *env)
return env;
section = "environment";
tag = cb->value + 1;
--
2.11.0
++++++ 0002-mount-call-setgroups-before-setuid.patch ++++++
>From 5b7da9d70261583e67e114b36cb19973de15606d Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@suse.com>
Date: Wed, 8 Feb 2017 08:22:36 +1100
Subject: [PATCH] mount: call setgroups() before setuid()
It is generally wise to call setgroups() (and setgid()) before calling
setuid() to ensure no unexpected permission leaks happen.
SUSE's build system check all binaries for conformance with this
and generates a warning for mountd.
As we set setting the uid to 0, there is no risk that the group list
will provide extra permissions, so there is no real risk here.
But it is nice to silence warnings, and including a setgroups()
call is probably a good practice to encourage.
Signed-off-by: NeilBrown <ne...@suse.com>
---
utils/mount/network.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index d1c8fec75174..281e9354a7fa 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -33,6 +33,7 @@
#include <errno.h>
#include <netdb.h>
#include <time.h>
+#include <grp.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -804,6 +805,7 @@ int start_statd(void)
pid_t pid = fork();
switch (pid) {
case 0: /* child */
+ setgroups(0, NULL);
setgid(0);
setuid(0);
execle(START_STATD, START_STATD, NULL, envp);
--
2.11.0
++++++ 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch ++++++
>From 93b39628e0a2053d9b37cab7a60d78f782cb88ea Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@suse.com>
Date: Wed, 8 Feb 2017 12:56:38 +1100
Subject: [PATCH] nfs-server-generator: handle 'noauto' mounts correctly.
When this code was written the systemd documentation stated
that "RequiresMountsFor" ignored mountpoints marked as "noauto".
Unfortunately this is incorrect. Consquently a filesystem marked
as noauto that is also NFS exported will currently be mounted when
the NFS server is started. This is not what people expect.
So add a check for the noauto flag. If any ancestor of a given
export point has the noauto flag, no RequiresMountsFor will be
generated for that point.
Also skip RequiresMountsFor for exports marked 'mountpoint', as their
absence is, theoretically, already handled by mountd.
URL: https://github.com/systemd/systemd/issues/5249
Signed-off-by: NeilBrown <ne...@suse.com>
---
systemd/nfs-server-generator.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/systemd/nfs-server-generator.c b/systemd/nfs-server-generator.c
index cc99969e9922..4aa65094ca07 100644
--- a/systemd/nfs-server-generator.c
+++ b/systemd/nfs-server-generator.c
@@ -84,6 +84,28 @@ static void systemd_escape(FILE *f, char *path)
}
}
+static int has_noauto_flag(char *path)
+{
+ FILE *fstab;
+ struct mntent *mnt;
+
+ fstab = setmntent("/etc/fstab", "r");
+ if (!fstab)
+ return 0;
+
+ while ((mnt = getmntent(fstab)) != NULL) {
+ int l = strlen(mnt->mnt_dir);
+ if (strncmp(mnt->mnt_dir, path, l) != 0)
+ continue;
+ if (path[l] && path[l] != '/')
+ continue;
+ if (hasmntopt(mnt, "noauto"))
+ break;
+ }
+ fclose(fstab);
+ return mnt != NULL;
+}
+
int main(int argc, char *argv[])
{
char *path;
@@ -124,6 +146,10 @@ int main(int argc, char *argv[])
for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
if (!is_unique(&list, exp->m_export.e_path))
continue;
+ if (exp->m_export.e_mountpoint)
+ continue;
+ if (has_noauto_flag(exp->m_export.e_path))
+ continue;
if (strchr(exp->m_export.e_path, ' '))
fprintf(f, "RequiresMountsFor=\"%s\"\n",
exp->m_export.e_path);
--
2.11.0
++++++ nfs-mountd.options.conf ++++++
[Service]
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=
ExecStart=-/usr/sbin/rpc.mountd $MOUNTD_OPTIONS
++++++ nfs-server.options.conf ++++++
[Service]
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=
ExecStart=-/usr/sbin/rpc.nfsd $NFSD_OPTIONS
++++++ nfs-utils-1.3.4.tar.xz -> nfs-utils-2.1.1.tar.xz ++++++
++++ 6008 lines of diff (skipped)
++++++ nfs-config.restart.conf -> nfs.conf ++++++
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-config.restart.conf
2015-07-20 11:16:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs.conf 2017-02-16
16:41:49.381476966 +0100
@@ -1,4 +1,80 @@
-[Unit]
-# Ensure config file is re-processed when nfs or nfsserver
-# is restarted
-PartOf = nfs-server.service nfs-client.target
+#
+# This is a general configuration for the
+# NFS daemons and tools
+# DO NOT MAKE CHANGES TO THIS FILE as they will
+# be lost on the next software update. Make changes
+# to /etc/sysconfig/nfs or /etc/nfs.conf.local instead.
+# /etc/nfs.conf.local can include multiple sections, just
+# like this file.
+
+[environment]
+include = /etc/sysconfig/nfs
+include = /etc/nfs.conf.local
+[general]
+ pipefs-directory=$RPC_PIPEFS_DIR
+#
+#[exportfs]
+# debug=0
+#
+#[gssd]
+# use-memcache=0
+# use-machine-creds=1
+ avoid-dns=$NFS_GSSD_AVOID_DNS
+# limit-to-legacy-enctypes=0
+# context-timeout=0
+# rpc-timeout=5
+# keytab-file=/etc/krb5.keytab
+# cred-cache-directory=
+# preferred-realm=
+#
+[lockd]
+ port=$LOCKD_TCPPORT
+ udp-port=$LOCKD_UDPPORT
+#
+[mountd]
+# debug=0
+# manage_gids=n
+# descriptors=0
+ port= $MOUNTD_PORT
+# threads=1
+# reverse-lookup=n
+# state-directory-path=/var/lib/nfs
+# ha-callout=
+#
+#[nfsdcltrack]
+# debug=0
+# storagedir=/var/lib/nfs/nfsdcltrack
+#
+[nfsd]
+# debug=0
+ threads= $USE_KERNEL_NFSD_NUMBER
+# host=
+# port=0
+# grace-time=90
+ lease-time=$NFS4LEASETIME
+# udp=y
+# tcp=y
+# vers2=n
+ vers3=$NFS3_SERVER_SUPPORT
+ vers4=$NFS4_SUPPORT
+# vers4.0=y
+# vers4.1=y
+# vers4.2=y
+# rdma=n
+#
+[statd]
+# debug=0
+ port=$STATD_PORT
+# outgoing-port=0
+ name=$STATD_HOSTNAME
+# state-directory-path=/var/lib/nfs/statd
+# ha-callout=
+#
+#[sm-notify]
+# debug=0
+# retry-time=900
+# outgoing-port=
+# outgoing-addr=
+#
+#[svcgssd]
+# principal=
++++++ rpc-gssd.options.conf ++++++
[Service]
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=
ExecStart=-/usr/sbin/rpc.gssd $GSSD_OPTIONS
++++++ rpc-statd-notify.options.conf ++++++
[Service]
ExecStart=
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=-/usr/sbin/sm-notify $SM_NOTIFY_OPTIONS
++++++ rpc-statd.options.conf ++++++
[Service]
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=
ExecStart=-/usr/sbin/rpc.statd $STATD_OPTIONS
++++++ rpc-svcgssd.options.conf ++++++
[Service]
EnvironmentFile=-/etc/sysconfig/nfs
ExecStart=
ExecStart=-/usr/sbin/rpc.svcgssd $SVCGSSD_OPTIONS
++++++ sysconfig.nfs ++++++
--- /var/tmp/diff_new_pack.XdWKKQ/_old 2017-02-16 16:41:51.457182178 +0100
+++ /var/tmp/diff_new_pack.XdWKKQ/_new 2017-02-16 16:41:51.457182178 +0100
@@ -2,7 +2,7 @@
## Description: number of threads for kernel nfs server
## Type: integer
## Default: 4
-## ServiceRestart: nfsserver
+## ServiceRestart: nfs-server
#
# the kernel nfs-server supports multiple server threads
#
@@ -12,7 +12,7 @@
## Description: use fixed port number for mountd
## Type: integer
## Default: ""
-## ServiceRestart: nfsserver
+## ServiceRestart: nfs-mountd
#
# Only set this if you want to start mountd on a fixed
# port instead of the port assigned by rpc. Only for use
@@ -21,20 +21,10 @@
MOUNTD_PORT=""
## Path: Network/File systems/NFS server
-## Description: GSS security for NFS
-## Type: yesno
-## Default: yes
-## ServiceRestart: nfs,nfsserver
-#
-# Enable RPCSEC_GSS security for NFS (yes/no)
-#
-NFS_SECURITY_GSS="no"
-
-## Path: Network/File systems/NFS server
## Description: NFSv3 server support
## Type: yesno
## Default: yes
-## ServiceRestart: nfsserver
+## ServiceRestart: nfs-server
#
# Enable NFSv3 server support (yes/no)
# This causes the NFS server to respond to
@@ -47,23 +37,13 @@
## Description: NFSv4 protocol support
## Type: yesno
## Default: yes
-## ServiceRestart: nfs,nfsserver
+## ServiceRestart: nfs-server
#
# Enable NFSv4 support (server and/or client) (yes/no)
#
NFS4_SUPPORT="yes"
## Path: Network/File systems/NFS server
-## Description: NFSv4 server minor version
-## Type: integer
-## Default: 0
-## ServiceRestart: nfsserver
-#
-# Select NFSv4 minor version for server to support (0, 1).
-# If '1' is selected, NFSv4.0 will also be supported.
-NFS4_SERVER_MINOR_VERSION="0"
-
-## Path: Network/File systems/NFS server
## Description: Network Status Monitor options
## Type: string
## Default: ""
@@ -75,25 +55,10 @@
SM_NOTIFY_OPTIONS=""
## Path: Network/File systems/NFS server
-## Description: Always start NFS services
-## Type: yesno
-## Default: yes
-## ServiceRestart nfs
-#
-# Always start NFS services (gssd, idmapd), not only if
-# there are nfs mounts in /etc/fstab. This is likely to be
-# needed if you use an automounter for NFS.
-# Note that the nfs service is no longer enabled by default
-# and the command "chkconfig nfs on" is needed to fully enable
-# NFS.
-#
-NFS_START_SERVICES="yes"
-
-## Path: Network/File systems/NFS server
## Description: Port rpc.statd should listen on
## Type: integer
## Default: ""
-## ServiceRestart: nfsserver
+## ServiceRestart: rpc-statd
#
# Statd will normally choose a random port to listen on and
# SuSE-Firewall is able to detect which port and allow for it.
@@ -105,7 +70,7 @@
## Description: Hostname used by rpc.statd
## Type: string
## Default: ""
-## ServiceRestart: nfsserver
+## ServiceRestart: rpc-statd
#
# statd will normally use the system hostname in status
# monitoring conversations with other hosts. If a different
@@ -118,7 +83,7 @@
## Description: TCP Port that lockd should listen on
## Type: integer
## Default: ""
-## ServiceRestart: nfsserver
+## ServiceRestart: nfs-server
#
# Lockd will normally choose a random port to listen on and
# SuSE-Firewall is able to detect which port and allow for it.
@@ -132,7 +97,7 @@
## Description: UDP Port that lockd should listen on
## Type: integer
## Default: ""
-## ServiceRestart: nfsserver
+## ServiceRestart: nfs-server
#
# Lockd will normally choose a random port to listen on and
# SuSE-Firewall is able to detect which port and allow for it.
@@ -146,6 +111,7 @@
## Description: Command line parameters for rpc.statd
## Type: string
## Default: ""
+## ServiceRestart: rpc-statd
#
# Custom parameters for rpc.statd daemon. Typically this will
# be used to set the port number (-p).
@@ -171,6 +137,7 @@
## Description: Alternate mount point for rpc_pipefs filesystem
## Type: string
## Default: ""
+## ServiceRestart: nfs-utils
#
# In a high-availabilty configuration it is possible that /var/lib/nfs
# is redirected so some shared storage and so it is not convenient to
@@ -182,6 +149,7 @@
## Description: Options for svcgssd
## Type: string
## Default: ""
+## ServiceRestart: rpc-svcgssd
#
# Normally svcgssd does not require any option. However in a
# high-availabilty configuration it can be useful to pass "-n"
@@ -194,6 +162,7 @@
## Description: Extra options for nfsd
## Type: string
## Default: ""
+## ServiceRestart nfs-server
#
# This setting allows extra options to be specified for NFSD, such as
# -H <shared_hostname> in a high-availability configuration.
@@ -203,6 +172,7 @@
## Description: Extra options for gssd
## Type: string
## Default: ""
+## ServiceRestart: rpc-gssd
#
# Normally gssd does not require any options. In some circumstances,
# -n, -l or other options might be useful. See "man 8 rpc.gssd" for
@@ -213,6 +183,7 @@
## Description: Extra options for mountd
## Type: string
## Default: ""
+## ServiceRestart nfs-mountd
#
# Normally mountd does not require any options. In some circumstances,
# -n, -t, -g or other options might be useful. See "man 8 rpc.mountd" for
@@ -225,7 +196,7 @@
## Description: Avoid DNS lookups for kerberos principal
## Type: yesno
## Default: no
-## ServiceRestart: gssd
+## ServiceRestart: rpc-gssd
#
# Avoid DNS lookups when determining kerberos identity
# of NFS server (yes/no)
