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 +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 + +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 f1fc148..df96c10 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.0 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 # group all 32bit related archs @@ -32,6 +32,7 @@ Patch106: nfs-utils-1.2.1-rc7.patch Patch200: nfs-utils-1.2.0-v4root-rel7.patch Patch201: nfs-utils-1.2.0-mount-default.patch +Patch202: nfs-utils-1.2.1-nfsd-bootfail.patch Group: System Environment/Daemons @@ -94,6 +95,7 @@ This package also contains the mount.nfs and umount.nfs program. %patch200 -p1 %patch201 -p1 +%patch202 -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -265,6 +267,10 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Thu Nov 12 2009 Steve Dickson 1.2.0-19 +- Stop rpc.nfsd from failing to startup when the network + is down (bz 532270) + * Mon Nov 2 2009 Steve Dickson 1.2.0-18 - Reworked and remove some of the Default-Start/Stop stanzas in the init scripts (bz 531425)