Decouple the starting of nfs-service and rpcbind (bz 1279526)

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2015-11-16 14:51:51 -05:00
parent 0fb5416ce0
commit a5619894ec
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -up nfs-utils-1.3.3/systemd/nfs-server.service.orig nfs-utils-1.3.3/systemd/nfs-server.service
--- nfs-utils-1.3.3/systemd/nfs-server.service.orig 2015-09-26 10:01:11.000000000 -0400
+++ nfs-utils-1.3.3/systemd/nfs-server.service 2015-11-09 12:16:39.452907289 -0500
@@ -1,7 +1,7 @@
[Unit]
Description=NFS server and services
DefaultDependencies=no
-Requires= network.target proc-fs-nfsd.mount rpcbind.service
+Requires= network.target proc-fs-nfsd.mount rpcbind.target
Requires= nfs-mountd.service
Wants=rpc-statd.service nfs-idmapd.service
Wants=rpc-statd-notify.service
diff -up nfs-utils-1.3.3/systemd/rpc-statd.service.orig nfs-utils-1.3.3/systemd/rpc-statd.service
--- nfs-utils-1.3.3/systemd/rpc-statd.service.orig 2015-11-09 12:16:39.452907289 -0500
+++ nfs-utils-1.3.3/systemd/rpc-statd.service 2015-11-09 12:17:30.891285825 -0500
@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2
DefaultDependencies=no
Conflicts=umount.target
Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
+After=network.target nss-lookup.target rpcbind.service
PartOf=nfs-utils.service

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.3.3 Version: 1.3.3
Release: 1.rc1%{?dist}.1 Release: 2.rc1%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -16,6 +16,7 @@ Source3: nfs-utils_env.sh
Source4: lockd.conf Source4: lockd.conf
Patch001: nfs-utils-1.3.4-rc1.patch Patch001: nfs-utils-1.3.4-rc1.patch
Patch002: nfs-utils-1.3.3-systemd-decouple.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -75,6 +76,7 @@ This package also contains the mount.nfs and umount.nfs program.
%setup -q %setup -q
%patch001 -p1 %patch001 -p1
%patch002 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
@ -291,6 +293,9 @@ fi
/sbin/umount.nfs4 /sbin/umount.nfs4
%changelog %changelog
* Mon Nov 16 2015 Steve Dickson <steved@redhat.com> 1.3.3-2.rc1
- Decouple the starting of nfs-service and rpcbind (bz 1279526)
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.3.3-1.rc1.1 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.3.3-1.rc1.1
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5