patch-1.3.86 linux/fs/nfs/nfsroot.c

Next file: linux/fs/open.c
Previous file: linux/fs/namei.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.85/linux/fs/nfs/nfsroot.c linux/fs/nfs/nfsroot.c
@@ -834,7 +834,8 @@
 
 	/* Extract basic fields */
 	myaddr.sin_addr.s_addr = recv_bootp->your_ip;
-	server.sin_addr.s_addr = recv_bootp->server_ip;
+	if (server.sin_addr.s_addr==INADDR_NONE)
+		server.sin_addr.s_addr = recv_bootp->server_ip;
 
 	/* Parse extensions */
 	if (recv_bootp->vendor_area[0] == 99 &&	/* Check magic cookie */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this