From 3245f710759eeafd771da9559dacc145ee9cf350 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Thu, 12 Nov 2009 19:50:55 +0000
Subject: [PATCH] - Stop rpc.nfsd from failing to startup when the network is
 down (bz     532270)

---
 nfs-utils-1.2.1-nfsd-bootfail.patch | 25 +++++++++++++++++++++++++
 nfs-utils.spec                      |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 nfs-utils-1.2.1-nfsd-bootfail.patch

diff --git a/nfs-utils-1.2.1-nfsd-bootfail.patch b/nfs-utils-1.2.1-nfsd-bootfail.patch
new file mode 100644
index 0000000..eeb580d
--- /dev/null
+++ b/nfs-utils-1.2.1-nfsd-bootfail.patch
@@ -0,0 +1,25 @@
+commit 2905358524c0835311501bad04c521479b0525ff
+Author: Steve Dickson <steved@redhat.com>
+Date:   Thu Nov 12 14:16:12 2009 -0500
+
+    Remove the AI_ADDRCONFIG hint flag to getaddrinfo() when it's
+    call by nfsd to set up the file descriptors that are
+    sent to the kernel. The flag causes the getaddrinfo()
+    to fail, with EAI_NONAME, when there is not a non-loopback
+    network interface configured.
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
+index 12d3253..b8028bb 100644
+--- a/utils/nfsd/nfssvc.c
++++ b/utils/nfsd/nfssvc.c
+@@ -212,7 +212,7 @@ int
+ nfssvc_set_sockets(const int family, const unsigned int protobits,
+ 		   const char *host, const char *port)
+ {
+-	struct addrinfo hints = { .ai_flags = AI_PASSIVE | AI_ADDRCONFIG };
++	struct addrinfo hints = { .ai_flags = AI_PASSIVE };
+ 
+ 	hints.ai_family = family;
+ 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 04d4a5e..27e06be 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.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -23,6 +23,7 @@ Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
 Patch200: nfs-utils-1.2.0-v4root-rel8.patch
+Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -75,6 +76,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch02 -p1
 
 %patch200 -p1
+%patch201 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -246,6 +248,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Nov 12 2009 Steve Dickson <steved@redhat.com> 1.2.1-3
+- Stop rpc.nfsd from failing to startup when the network
+  is down (bz 532270)
+
 * Wed Nov 11 2009 Steve Dickson <steved@redhat.com> 1.2.1-2
 - Updated to the latest pseudo root release (rel8).