[src/netbsd-1-4]: src/sys/arch/pmax/conf Pull up HEAD 1.40-1.41 diff (leaving...

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

details:   https://anonhg.NetBSD.org/src/rev/7d59be17cdb2
branches:  netbsd-1-4
changeset: 468397:7d59be17cdb2
user:      cjs <cjs%NetBSD.org@localhost>
date:      Tue Apr 20 23:42:44 1999 +0000

description:
Pull up HEAD 1.40-1.41 diff (leaving out some earlier ones) per
Simon Burge <simonb%netbsd.org@localhost>

diffstat:

 sys/arch/pmax/conf/GENERIC |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r e2bb1189f6fd -r 7d59be17cdb2 sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC        Tue Apr 20 23:37:22 1999 +0000
+++ b/sys/arch/pmax/conf/GENERIC        Tue Apr 20 23:42:44 1999 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.39 1999/03/29 05:56:29 nisimura Exp $
+#      $NetBSD: GENERIC,v 1.39.2.1 1999/04/20 23:42:44 cjs Exp $
 #
 # Distribution kernel (any model) kernel config file
 #
@@ -90,8 +90,7 @@
 options        EXEC_ECOFF      # Ultrix RISC binaries are ECOFF format
 options        "HZ=256"        # RTC rate required
 
-# The pmax proms need bootp anyway, so just use bootp.
-options        NFS_BOOT_BOOTP
+options        NFS_BOOT_DHCP   # superset of BOOTP
 
 config         netbsd          root on ? type ?
 config         nfsnetbsd       root on ? type nfs