diff --git a/nfs-utils-1.3.3-systemd-decouple.patch b/nfs-utils-1.3.3-systemd-decouple.patch new file mode 100644 index 0000000..2987d5e --- /dev/null +++ b/nfs-utils-1.3.3-systemd-decouple.patch @@ -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 + diff --git a/nfs-utils.spec b/nfs-utils.spec index d4d7800..9f15e45 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.3.3 -Release: 1.rc1%{?dist}.1 +Release: 2.rc1%{?dist} Epoch: 1 # group all 32bit related archs @@ -16,6 +16,7 @@ Source3: nfs-utils_env.sh Source4: lockd.conf 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 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 %patch001 -p1 +%patch002 -p1 %patch100 -p1 %patch101 -p1 @@ -291,6 +293,9 @@ fi /sbin/umount.nfs4 %changelog +* Mon Nov 16 2015 Steve Dickson 1.3.3-2.rc1 +- Decouple the starting of nfs-service and rpcbind (bz 1279526) + * Tue Nov 10 2015 Fedora Release Engineering - 1:1.3.3-1.rc1.1 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5