Removed the nfs-idmap service. rpc.idmap is now part of the nfs-server service

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2011-12-15 11:26:23 -05:00
parent 1a0cf62a6a
commit 84e3666b95
2 changed files with 10 additions and 9 deletions

View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=NFS Server Description=NFS Server
Requires=proc-fs-nfsd.mount Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
After=syslog.target network.target rpcbind.service proc-fs-nfsd.mount After=network.target named.service rpcbind.service proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
[Service] [Service]
Type=forking Type=forking

View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 1.2.5 Version: 1.2.5
Release: 7%{?dist} Release: 8%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -16,9 +16,8 @@ Source11: nfs-lock.service
Source12: nfs-secure.service Source12: nfs-secure.service
Source13: nfs-secure-server.service Source13: nfs-secure-server.service
Source14: nfs-server.service Source14: nfs-server.service
Source15: nfs-idmap.service Source15: nfs-blkmap.service
Source16: nfs-blkmap.service %define nfs_services %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15}
%define nfs_services %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16}
Source20: var-lib-nfs-rpc_pipefs.mount Source20: var-lib-nfs-rpc_pipefs.mount
Source21: proc-fs-nfsd.mount Source21: proc-fs-nfsd.mount
@ -192,7 +191,6 @@ else
fi fi
%post %post
/bin/systemctl enable nfs-idmap.service >/dev/null 2>&1 || :
/bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || : /bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || :
# Make sure statd used the correct uid/gid. # Make sure statd used the correct uid/gid.
chown -R rpcuser:rpcuser /var/lib/nfs/statd chown -R rpcuser:rpcuser /var/lib/nfs/statd
@ -222,7 +220,6 @@ fi
/bin/systemctl --system daemon-reload >/dev/null 2>&1 || : /bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
%triggerun -- nfs-utils < 1:1.2.4-2 %triggerun -- nfs-utils < 1:1.2.4-2
/bin/systemctl enable nfs-idmap.service >/dev/null 2>&1 || :
/bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || : /bin/systemctl enable nfs-lock.service >/dev/null 2>&1 || :
if /sbin/chkconfig --level 3 nfs ; then if /sbin/chkconfig --level 3 nfs ; then
/bin/systemctl enable nfs-server.service >/dev/null 2>&1 || : /bin/systemctl enable nfs-server.service >/dev/null 2>&1 || :
@ -280,7 +277,11 @@ fi
%attr(0755,root,root) /sbin/umount.nfs4 %attr(0755,root,root) /sbin/umount.nfs4
%changelog %changelog
* Tue Dec 13 2011 Steve Dickson <steved@redhat.com> 1.2.5-6 * Thu Dec 15 2011 Steve Dickson <steved@redhat.com> 1.2.5-8
- Removed the nfs-idmap service. rpc.idmap is now part of
the nfs-server service
* Tue Dec 13 2011 Steve Dickson <steved@redhat.com> 1.2.5-7
- Enabled new idmaping by installing the id_resolver.conf file. - Enabled new idmaping by installing the id_resolver.conf file.
- Update to upstream RC release: nfs-utils-1.2.6-rc4 - Update to upstream RC release: nfs-utils-1.2.6-rc4