pool/nfs-utils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 817957 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/817957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger 2020-07-02 21:54:33 +00:00 committed by Git OBS Bridge
commit d5b0642d2a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nfs-utils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 5 10:02:18 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- Use group statd instead of nogroup, nogroup would invalidate
the extra statd user.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 26 04:43:19 UTC 2020 - Neil Brown <nfbrown@suse.com> Tue May 26 04:43:19 UTC 2020 - Neil Brown <nfbrown@suse.com>

13
nfs-utils.spec
View File

@ -80,9 +80,6 @@ Requires: netcfg
Requires: rpcbind Requires: rpcbind
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Requires(pre): permissions Requires(pre): permissions
%if 0%{?suse_version} >= 1330
Requires(pre): group(nogroup)
%endif
Obsoletes: nfs-utils < 1.1.0 Obsoletes: nfs-utils < 1.1.0
%sysusers_requires %sysusers_requires
@ -211,15 +208,15 @@ install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
%post -n nfs-client %post -n nfs-client
# lib/nfs must be root-owned. # lib/nfs must be root-owned.
# sm and sm.back and contents should be statd:nogroup, # sm and sm.back and contents should be statd:statd,
# but only chown if the dirs are currently root-owned. # but only chown if the dirs are currently root-owned.
# This is needed for some upgraded, but chown is best avoided # This is needed for some upgraded, but chown is best avoided
# when not necessary # when not necessary
chown root:root %{_localstatedir}/lib/nfs > /dev/null 2>&1 || : chown root:root %{_localstatedir}/lib/nfs > /dev/null 2>&1 || :
for i in sm sm.bak; do for i in sm sm.bak; do
p=%{_localstatedir}/lib/nfs/$i p=%{_localstatedir}/lib/nfs/$i
if [ -d "$b" -a -n "`chown 2> /dev/null -c --from root statd:nogroup $p`" ]; then if [ -d "$b" -a -n "`chown 2> /dev/null -c --from root statd:statd $p`" ]; then
chown -R statd:nogroup $p > /dev/null 2>&1 || : chown -R statd:statd $p > /dev/null 2>&1 || :
fi fi
done done
### migrate from /var/lock/subsys ### migrate from /var/lock/subsys
@ -350,8 +347,8 @@ fi
%dir %{_localstatedir}/lib/nfs %dir %{_localstatedir}/lib/nfs
%dir %{_localstatedir}/lib/nfs/rpc_pipefs %dir %{_localstatedir}/lib/nfs/rpc_pipefs
%dir %{_localstatedir}/lib/nfs/v4recovery %dir %{_localstatedir}/lib/nfs/v4recovery
%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm %attr(0700,statd,statd) %dir %{_localstatedir}/lib/nfs/sm
%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm.bak %attr(0700,statd,statd) %dir %{_localstatedir}/lib/nfs/sm.bak
%ghost %{_localstatedir}/lib/nfs/state %ghost %{_localstatedir}/lib/nfs/state
%files -n nfs-kernel-server %files -n nfs-kernel-server

3
statd-user.conf
View File

@ -1,4 +1,3 @@
# Type Name ID GECOS [HOME] # Type Name ID GECOS [HOME]
g statd - -
u statd - "NFS statd daemon" /var/lib/nfs u statd - "NFS statd daemon" /var/lib/nfs
m statd nogroup