[src/trunk]: src/sys/arch/sparc - Enable NFS_BOOT_DHCP (as well as the existi...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c48aac5ccc2
branches:  trunk
changeset: 526942:9c48aac5ccc2
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue May 14 14:27:33 2002 +0000

description:
- Enable NFS_BOOT_DHCP (as well as the existing NFS_BOOT_BOOTPARAM).
  DHCP/Bootp is tried before bootparams in the MI nfs mountroot code.
- Change the order in boot.net from "bootparams then bootp" to
  "bootp then bootparams", to be consistent with the MI nfs mountroot code.

(Consistency with other NetBSD ports is good, and things still work
for sites that run bootparams but not dhcp/bootp, although I'd argue that
dhcp/bootp is much easier to setup and manage and is easier to debug
than our rpc.bootparamd...)

Per discussion with Paul Kranenburg and Matt Green.

diffstat:

 sys/arch/sparc/conf/BILL-THE-CAT   |   4 ++--
 sys/arch/sparc/conf/GENERIC        |   8 ++++----
 sys/arch/sparc/conf/INSTALL        |   4 ++--
 sys/arch/sparc/conf/KRUPS          |   8 ++++----
 sys/arch/sparc/conf/TADPOLE3GX     |   6 +++---
 sys/arch/sparc/stand/common/net.c  |  10 +++++-----
 sys/arch/sparc/stand/ofwboot/net.c |  10 +++++-----
 7 files changed, 25 insertions(+), 25 deletions(-)

diffs (170 lines):

diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/conf/BILL-THE-CAT
--- a/sys/arch/sparc/conf/BILL-THE-CAT  Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/conf/BILL-THE-CAT  Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: BILL-THE-CAT,v 1.19 2002/04/25 15:06:37 atatat Exp $
+#      $NetBSD: BILL-THE-CAT,v 1.20 2002/05/14 14:27:33 lukem Exp $
 #      From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 
 include "arch/sparc/conf/std.sparc"
@@ -60,7 +60,7 @@
 #options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
-## NFS boot options; default on sparc is the bootparam protocol
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 #options       NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
 #options       NFS_BOOT_DHCP
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/conf/GENERIC
--- a/sys/arch/sparc/conf/GENERIC       Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/conf/GENERIC       Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2002/04/25 15:06:37 atatat Exp $
+# $NetBSD: GENERIC,v 1.134 2002/05/14 14:27:33 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.133 $"
+#ident                 "GENERIC-$Revision: 1.134 $"
 
 maxusers       32
 
@@ -85,10 +85,10 @@
 #options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
-## NFS boot options; default on sparc is the bootparam protocol
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 options        NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
+options        NFS_BOOT_DHCP
 
 #### Debugging options
 
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/conf/INSTALL
--- a/sys/arch/sparc/conf/INSTALL       Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/conf/INSTALL       Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.34 2002/04/25 15:06:37 atatat Exp $
+#      $NetBSD: INSTALL,v 1.35 2002/05/14 14:27:33 lukem Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -76,7 +76,7 @@
 #options       USERCONF        # userconf(4) support
 options                PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
-## NFS boot options; default on sparc is the bootparam protocol
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 options        NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
 options        NFS_BOOT_DHCP
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/conf/KRUPS
--- a/sys/arch/sparc/conf/KRUPS Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/conf/KRUPS Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.8 2002/05/06 02:04:14 uwe Exp $
+# $NetBSD: KRUPS,v 1.9 2002/05/14 14:27:33 lukem Exp $
 # From: NetBSD: GENERIC,v 1.133 2002/04/25 15:06:37 atatat Exp
 #
 # Krups (JavaStation 10, aka JavaStation NC) machine description file
@@ -10,7 +10,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "KRUPS-$Revision: 1.8 $"
+#ident                 "KRUPS-$Revision: 1.9 $"
 
 maxusers       32
 
@@ -70,10 +70,10 @@
 #options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
-## NFS boot options; default on sparc is the bootparam protocol
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 options        NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
+options        NFS_BOOT_DHCP
 
 #### Debugging options
 
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/conf/TADPOLE3GX
--- a/sys/arch/sparc/conf/TADPOLE3GX    Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/conf/TADPOLE3GX    Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: TADPOLE3GX,v 1.14 2002/04/25 15:06:37 atatat Exp $
+#      $NetBSD: TADPOLE3GX,v 1.15 2002/05/14 14:27:33 lukem Exp $
 
 include "arch/sparc/conf/std.sparc"
 
@@ -55,10 +55,10 @@
 #options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
-## NFS boot options; default on sparc is the bootparam protocol
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 options        NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
+options        NFS_BOOT_DHCP
 
 #### Debugging options
 
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/stand/common/net.c
--- a/sys/arch/sparc/stand/common/net.c Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/stand/common/net.c Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.5 2000/01/22 12:34:57 pk Exp $       */
+/*     $NetBSD: net.c,v 1.6 2002/05/14 14:27:33 lukem Exp $    */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -173,11 +173,11 @@
         * and the more modern, BOOTP way. (RFC951, RFC1048)
         */
 
-       /* Historically, we've used BOOTPARAMS, so try that first */
-       error = net_mountroot_bootparams();
+               /* Try BOOTP first */
+       error = net_mountroot_bootp();
+               /* Historically, we've used BOOTPARAMS, so try that next */
        if (error != 0)
-               /* Next, try BOOTP */
-               error = net_mountroot_bootp();
+               error = net_mountroot_bootparams();
        if (error != 0)
                return (error);
 
diff -r 99f424f1e093 -r 9c48aac5ccc2 sys/arch/sparc/stand/ofwboot/net.c
--- a/sys/arch/sparc/stand/ofwboot/net.c        Tue May 14 14:22:33 2002 +0000
+++ b/sys/arch/sparc/stand/ofwboot/net.c        Tue May 14 14:27:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.1 2000/08/20 14:58:38 mrg Exp $      */
+/*     $NetBSD: net.c,v 1.2 2002/05/14 14:27:34 lukem Exp $    */
 
 /*
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -177,11 +177,11 @@
         * and the more modern, BOOTP way. (RFC951, RFC1048)
         */
 
-       /* Historically, we've used BOOTPARAMS, so try that first */
-       error = net_mountroot_bootparams();
+               /* Try BOOTP first */
+       error = net_mountroot_bootp();
+               /* Historically, we've used BOOTPARAMS, so try that next */
        if (error != 0)
-               /* Next, try BOOTP */
-               error = net_mountroot_bootp();
+               error = net_mountroot_bootparams();
        if (error != 0)
                return (error);