diff -Nru nfs-utils-1.3.4/debian/changelog nfs-utils-1.3.4/debian/changelog --- nfs-utils-1.3.4/debian/changelog 2017-02-27 22:13:50.000000000 +0000 +++ nfs-utils-1.3.4/debian/changelog 2016-12-17 10:49:21.000000000 +0000 @@ -1,10 +1,3 @@ -nfs-utils (1:1.3.4-2.1) unstable; urgency=medium - - * Non-maintainer upload. - * Add systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch (Closes: #856328) - - -- Rafael David Tinoco Mon, 27 Feb 2017 22:13:50 +0000 - nfs-utils (1:1.3.4-2) unstable; urgency=medium [ Daniel Pocock ] diff -Nru nfs-utils-1.3.4/debian/patches/series nfs-utils-1.3.4/debian/patches/series --- nfs-utils-1.3.4/debian/patches/series 2017-02-27 21:55:26.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/series 2016-12-17 10:47:35.000000000 +0000 @@ -10,4 +10,3 @@ unbreak-gssd-rpc_pipefs-run.patch 28-nfs-utils_env-location.patch 29-start-statd-fd-9.patch -systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch diff -Nru nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch --- nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch 2017-02-27 21:57:49.000000000 +0000 +++ nfs-utils-1.3.4/debian/patches/systemd-Fix-nfs-mountd-dependency-on-rpcbind.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Description: systemd: Fix nfs-mountd dependency on rpcbind - -Following commit 91da135f - it replaced "rpcbind.target" by "rpcbind.socket" in -some unit files - "rpcbind.socket" should also be added to "nfs-mountd.service" -as a dependency to avoid race conditions. - -Usually "rpcbind.socket" is either started as a "sockets.target" dependency, or -as a dependency for "nfs-server.service", when unit files include it in -"BindsTo" or "After". Unfortunately there is a possilibility to have -"nfs-mountd.service" started when the rpcbind socket is not yet created: - -systemd[1]: Starting NFS Mount Daemon... -systemd[1]: nfs-mountd.service: Control process exited, code=exited status=1 -systemd[1]: Failed to start NFS Mount Daemon. -systemd[1]: nfs-mountd.service: Unit entered failed state. -systemd[1]: nfs-mountd.service: Failed with result 'exit-code'. - -Nowadays "nfs-mountd.service" uses "BindTo" directive to "nfs-server.service". -That, per se, doesn't guarantee ordering for NFS server to start rpcbind and for -nfs-mountd to depend on it. - -https://bugs.launchpad.net/bugs/1590799 - -Reviewed-by: NeilBrown -Signed-off-by: Rafael David Tinoco -Signed-off-by: Steve Dickson - -- -Author: Rafael David Tinoco -Bug: https://www.spinics.net/lists/linux-nfs/msg62022.html -Bug-Debian: https://bugs.debian.org/856328 -Bug-Ubuntu: https://launchpad.net/bugs/1590799 -Reviewed-By: Rafael David Tinoco -Last-Update: 2017-02-27 - ---- nfs-utils-1.3.4.orig/systemd/nfs-mountd.service -+++ nfs-utils-1.3.4/systemd/nfs-mountd.service -@@ -4,6 +4,7 @@ DefaultDependencies=no - Requires=proc-fs-nfsd.mount - After=proc-fs-nfsd.mount - After=network.target local-fs.target -+After=rpcbind.target - BindsTo=nfs-server.service - - Wants=nfs-config.service