Module Name: src
Committed By: riz
Date: Sun Nov 18 21:58:42 UTC 2012
Modified Files:
src/sys/arch/x68k/conf [netbsd-6]: GENERIC
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #647):
sys/arch/x68k/conf/GENERIC: revision 1.162
Now we get working netboot loader, so enable options NFS_BOOT_DHCP by default.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.159.2.1 src/sys/arch/x68k/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.159 src/sys/arch/x68k/conf/GENERIC:1.159.2.1
--- src/sys/arch/x68k/conf/GENERIC:1.159 Sun Dec 18 05:49:33 2011
+++ src/sys/arch/x68k/conf/GENERIC Sun Nov 18 21:58:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.159 2011/12/18 05:49:33 dholland Exp $
+# $NetBSD: GENERIC,v 1.159.2.1 2012/11/18 21:58:42 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.159 $"
+#ident "GENERIC-$Revision: 1.159.2.1 $"
maxusers 8
@@ -93,7 +93,7 @@ options SYSCTL_INCLUDE_DESCR # Include
## NFS boot options; not supported currently: needs nfsboot program
#options NFS_BOOT_BOOTPARAM
#options NFS_BOOT_BOOTP
-#options NFS_BOOT_DHCP
+options NFS_BOOT_DHCP
#### Debugging options
