patch-2.4.22 linux-2.4.22/net/ipv4/ipconfig.c

Next file: linux-2.4.22/net/ipv4/ipip.c
Previous file: linux-2.4.22/net/ipv4/ip_sockglue.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/net/ipv4/ipconfig.c linux-2.4.22/net/ipv4/ipconfig.c
@@ -1114,6 +1114,10 @@
 				       "nameserver %u.%u.%u.%u\n",
 				       NIPQUAD(ic_nameservers[i]));
 	}
+	if (ic_servaddr != INADDR_NONE)
+		len += sprintf(buffer + len,
+			       "bootserver %u.%u.%u.%u\n",
+			       NIPQUAD(ic_servaddr));
 
 	if (offset > len)
 		offset = len;
@@ -1230,7 +1234,7 @@
 			 * 				-- Chip
 			 */
 #ifdef CONFIG_ROOT_NFS
-			if (ROOT_DEV == MKDEV(UNNAMED_MAJOR, 255)) {
+			if (ROOT_DEV == MKDEV(NFS_MAJOR, NFS_MINOR)) {
 				printk(KERN_ERR 
 					"IP-Config: Retrying forever (NFS root)...\n");
 				goto try_try_again;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)