SYSCONS is no longer needed since pccons has been removed.

Update the GENERIC* to have the new file system options and the new kernel
name.

Fix the clean target in Makefile.i386 to rm kernel instead of 386bsd.

5 files changed, 15 insertions, 11 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index b755dba..20d1ee9 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -81,7 +81,7 @@ libkern.a:
 	echo ln -s $S/libkern/obj/libkern.a libkern.a
 
 clean:
-	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
+	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
 		errs linterrs makelinks genassym ,assym.s stamp-assym
 
 #lint: /tmp param.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index b755dba..20d1ee9 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -81,7 +81,7 @@ libkern.a:
 	echo ln -s $S/libkern/obj/libkern.a libkern.a
 
 clean:
-	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
+	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
 		errs linterrs makelinks genassym ,assym.s stamp-assym
 
 #lint: /tmp param.c
diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH
index c1a00df..b649759 100644
--- a/sys/i386/conf/GENERICAH
+++ b/sys/i386/conf/GENERICAH
@@ -10,12 +10,14 @@ cpu		"I486_CPU"
 ident		GENERICAH
 timezone	8 dst
 maxusers	10
-maxfdescs	2048			#Max file descriptors per process
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
-options		ISOFS			#ISO File System
+options		FFS			#Berkeley Fast File System
+options		KERNFS			#Kernel File System
+options		FDESC			#File Descriptor File System
+options		MFS			#Memory File System
+options		"CD9660"		#CD ISO9660 File System
 options		NFS			#Network File System
-options		PCFS			#MSDOS File System
 options		"COMPAT_43"		#Compatible with BSD 4.3
 options		"TCP_COMPAT_42"		#TCP/IP compatible with 4.2
 options		XSERVER			#Xserver
@@ -26,7 +28,7 @@ options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
 options		"NCONS=4"		#4 virtual consoles
 options		"STAR_SAVER"		#syscons "stars" screen saver
 
-config		"386bsd"	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
+config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
 
 controller	isa0
 
diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT
index 85f80de..2719ff8 100644
--- a/sys/i386/conf/GENERICBT
+++ b/sys/i386/conf/GENERICBT
@@ -10,12 +10,14 @@ cpu		"I486_CPU"
 ident		GENERICBT
 timezone	8 dst
 maxusers	10
-maxfdescs	2048			#Max file descriptors per process
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
-options		ISOFS			#ISO File System
+options		FFS			#Berkeley Fast File System
+options		KERNFS			#Kernel File System
+options		FDESC			#File Descriptor File System
+options		MFS			#Memory File System
+options		"CD9660"		#CD ISO9660 File System
 options		NFS			#Network File System
-options		PCFS			#MSDOS File System
 options		"COMPAT_43"		#Compatible with BSD 4.3
 options		"TCP_COMPAT_42"		#TCP/IP compatible with 4.2
 options		XSERVER			#Xserver
@@ -26,7 +28,7 @@ options		"NCONS=4"		#4 virtual consoles
 options		"STAR_SAVER"		#syscons "stars" screen saver
 options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
 
-config		"386bsd"	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
+config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
 
 controller	isa0
 
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index b755dba..20d1ee9 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -81,7 +81,7 @@ libkern.a:
 	echo ln -s $S/libkern/obj/libkern.a libkern.a
 
 clean:
-	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
+	rm -f eddep *kernel tags *.o locore.i [a-uw-z]*.s \
 		errs linterrs makelinks genassym ,assym.s stamp-assym
 
 #lint: /tmp param.c