From 603201775cd1e28aecb8cb1eb992a3f55011bee729314c817f829908efc669c4 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Sun, 31 Oct 2021 22:25:04 +0000
Subject: [PATCH] Accepting request 927964 from home:gmbr3:Active

- Add CONFIG parameter to %sysusers_generate_pre
- Remove unneeded group line (user implies group)
- Add Shell parameter to statd-user.conf

OBS-URL: https://build.opensuse.org/request/show/927964
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=248
---
 nfs-utils.changes | 7 +++++++
 nfs-utils.spec    | 3 +--
 statd-user.conf   | 5 ++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index a81f122..f9cca78 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 28 12:51:31 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Add CONFIG parameter to %sysusers_generate_pre
+- Remove unneeded group line (user implies group)
+- Add Shell parameter to statd-user.conf
+
 -------------------------------------------------------------------
 Mon Oct 25 23:53:37 UTC 2021 - Neil Brown <nfbrown@suse.com>
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 427641c..d5628a7 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -50,7 +50,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  rpcgen
-BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(devmapper)
@@ -146,7 +145,7 @@ export LDFLAGS="-pie"
 	--with-pluginpath=%{_libdir}/libnfsidmap-1.0.0 \
 	--enable-mountconfig
 make %{?_smp_mflags}
-%sysusers_generate_pre %{SOURCE12} statd
+%sysusers_generate_pre %{SOURCE12} statd statd-user.conf
 
 %install
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
diff --git a/statd-user.conf b/statd-user.conf
index 749e7ce..dc5c1ca 100644
--- a/statd-user.conf
+++ b/statd-user.conf
@@ -1,3 +1,2 @@
-# Type Name ID GECOS [HOME]
-g statd - -
-u statd - "NFS statd daemon" /var/lib/nfs
+# Type Name ID GECOS [HOME] Shell
+u statd - "NFS statd daemon" /var/lib/nfs -