From 41809f9413eba2e62598fbd009184d8ca373987f Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Fri, 31 Jan 1997 05:56:10 +0000
Subject: [PATCH] Adopt for new file system and root spec grammar.

---
 sys/arch/hp300/conf/BASALT   | 18 ++++++++++--------
 sys/arch/hp300/conf/DISKLESS | 18 ++++++++++--------
 sys/arch/hp300/conf/GENERIC  | 23 +++++++++++++----------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/sys/arch/hp300/conf/BASALT b/sys/arch/hp300/conf/BASALT
index bc4c0f144273..e006769f98a8 100644
--- a/sys/arch/hp300/conf/BASALT
+++ b/sys/arch/hp300/conf/BASALT
@@ -1,4 +1,4 @@
-#	$NetBSD: BASALT,v 1.14 1997/01/30 09:58:57 thorpej Exp $
+#	$NetBSD: BASALT,v 1.15 1997/01/31 05:56:10 thorpej Exp $
 #
 # Kernel for basalt.og.org - thorpej's HP380 file server.
 #
@@ -24,15 +24,17 @@ options 	KTRACE			# system call tracing support
 options 	NKMEMCLUSTERS=2048	# # 4K pages in kernel malloc pool
 options		LKM			# loadable kernel modules
 
+# Filesystems
+file-system	FFS		# fast filesystem
+file-system	NFS		# Network filesystem client
+file-system	KERNFS		# kernel data-structure filesystem
+file-system	FDESC		# user file descriptor filesystem
+file-system	PROCFS		# /proc filesystem
+file-system	MFS		# Memory-based filesystem
+
 # Filesystem options
 options		FIFO		# POSIX fifo support (in all filesystems)
-options		FFS		# fast filesystem
-options		NFSCLIENT	# Network filesystem client
 options		NFSSERVER	# Network filesystem server
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-options		PROCFS		# /proc filesystem
-options		MFS		# Memory-based filesystem
 
 # Networking options
 options		INET		# Internet protocols
@@ -50,7 +52,7 @@ options		COMPAT_M68K4K	# m68k4k executables
 options 	DIAGNOSTIC	# Kernel sanity checks
 options 	DDB		# Kernel Dynamic Debugger
 
-config		netbsd swap generic
+config		netbsd root on ? type ?
 
 mainbus0	at root		# root "bus"
 
diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 9275091e71d4..9b020a232d0c 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.14 1997/01/30 18:33:53 scottr Exp $
+#	$NetBSD: DISKLESS,v 1.15 1997/01/31 05:56:11 thorpej Exp $
 #
 # Diskless HP 9000/300-series workstation
 #
@@ -32,14 +32,16 @@ options 	SYSVMSG		# System V-style message queues
 options 	KTRACE		# system call tracing support
 options 	"NKMEMCLUSTERS=1024"	# # 4K pages in kernel malloc pool
 
+# Filesystems
+file-system 	NFS		# Network filesystem client
+file-system 	UNION		# Union filesystem (req. for FDESC)
+file-system 	KERNFS		# kernel data-structure filesystem
+file-system 	FDESC		# user file descriptor filesystem
+file-system 	PROCFS		# /proc filesystem
+file-system 	MFS		# Memory-based filesystem
+
 # Filesystem options
 options 	FIFO		# POSIX fifo support (in all filesystems)
-options 	NFSCLIENT	# Network filesystem client
-options 	UNION		# Union filesystem (req. for FDESC)
-options 	KERNFS		# kernel data-structure filesystem
-options 	FDESC		# user file descriptor filesystem
-options 	PROCFS		# /proc filesystem
-options 	MFS		# Memory-based filesystem
 
 # Networking options
 options 	INET		# Internet protocols
@@ -75,7 +77,7 @@ options 	DDB		# Kernel Dynamic Debugger
 # (Warning: this compiles in a large string table)
 options 	DIOVERBOSE	# recognize "unknown" DIO devices
 
-config		netbsd root on nfs
+config		netbsd root on ? type nfs
 
 mainbus0	at root		# root "bus"
 
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index bd6bdf4c12ce..668a9c079c95 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.21 1997/01/30 18:33:52 scottr Exp $
+#	$NetBSD: GENERIC,v 1.22 1997/01/31 05:56:12 thorpej Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -32,17 +32,20 @@ options 	SYSVMSG		# System V-style message queues
 options 	KTRACE		# system call tracing support
 options 	"NKMEMCLUSTERS=1024"	# # 4K pages in kernel malloc pool
 
+# Filesystems
+file-system 	FFS		# fast filesystem
+file-system 	CD9660		# CD-ROM ISO-9660 filesystem
+file-system 	NFSCLIENT	# Network filesystem client
+file-system 	UNION		# Union filesystem (req. for FDESC)
+file-system 	KERNFS		# kernel data-structure filesystem
+file-system 	FDESC		# user file descriptor filesystem
+file-system 	PROCFS		# /proc filesystem
+file-system 	MFS		# Memory-based filesystem
+
 # Filesystem options
 options 	FIFO		# POSIX fifo support (in all filesystems)
-options 	FFS,QUOTA	# fast filesystem with user and group quotas
-options         CD9660		# CD-ROM ISO-9660 filesystem
+options 	QUOTA		# User and group quotas in FFS
 options 	NFSSERVER	# Network filesystem server
-options 	NFSCLIENT	# Network filesystem client
-options 	UNION		# Union filesystem (req. for FDESC)
-options 	KERNFS		# kernel data-structure filesystem
-options 	FDESC		# user file descriptor filesystem
-options 	PROCFS		# /proc filesystem
-options 	MFS		# Memory-based filesystem
 
 # Networking options
 options 	INET		# Internet protocols
@@ -80,7 +83,7 @@ options 	DDB		# Kernel Dynamic Debugger
 # (Warning: this compiles in a large string table)
 options 	DIOVERBOSE	# recognize "unknown" DIO devices
 
-config		netbsd swap generic
+config		netbsd root on ? type ?
 
 mainbus0	at root		# root "bus"