Fix last change: If BOOTP/DHCP was successful, don't try RARP/BOOTPARAM. trunk
authordrochner <drochner@NetBSD.org>
Sat, 13 Jun 1998 14:13:25 +0000
branchtrunk
changeset 40150 9dc0e44bb335
parent 40149 5074e7a86d10
child 40151 7cd26c269df2
Fix last change: If BOOTP/DHCP was successful, don't try RARP/BOOTPARAM.
sys/nfs/nfs_boot.c
--- a/sys/nfs/nfs_boot.c	Sat Jun 13 04:33:40 1998 +0000
+++ b/sys/nfs/nfs_boot.c	Sat Jun 13 14:13:25 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.46 1998/06/13 04:28:46 tv Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.47 1998/06/13 14:13:25 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@
 
 	error = EADDRNOTAVAIL; /* ??? */
 #if defined(NFS_BOOT_BOOTP) || defined(NFS_BOOT_DHCP)
-	if (nfs_boot_rfc951) {
+	if (error && nfs_boot_rfc951) {
 #if defined(NFS_BOOT_DHCP)
 		printf("nfs_boot: trying DHCP/BOOTP\n");
 #else
@@ -130,7 +130,7 @@
 	}
 #endif
 #ifdef NFS_BOOT_BOOTPARAM
-	if (nfs_boot_bootparam) {
+	if (error && nfs_boot_bootparam) {
 		printf("nfs_boot: trying RARP (and RPC/bootparam)\n");
 		error = nfs_bootparam(ifp, nd, procp);
 	}