Enable NFS

Add configuration for test machine

4 files changed, 120 insertions, 5 deletions

diff --git a/sys/arch/i386/compile/.cvsignore b/sys/arch/i386/compile/.cvsignore
index e9c3a3d3433..11541818986 100644
--- a/sys/arch/i386/compile/.cvsignore
+++ b/sys/arch/i386/compile/.cvsignore
@@ -10,6 +10,7 @@ LAP
 NETTAN
 OPRAH
 PCMCIA
+SARUMAN
 SPARE-PARTS
 THREADWAY
 TDR
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index e92a24f1658..3a6aa41167f 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,7 +1,7 @@
 #
 #	GANDALF -- Dual Tyan P5/133 PCI/EISA bus
 #
-#	$OpenBSD: GANDALF,v 1.16 1996/10/28 00:43:36 tholo Exp $
+#	$OpenBSD: GANDALF,v 1.17 1996/11/05 03:57:15 tholo Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -20,7 +20,7 @@ option		XSERVER
 
 maxusers	32		# estimated number of users
 option		TIMEZONE=480	# time zone to adjust RTC time by
-option		DST=1		# daylight savings time used by RTC
+option		DST=0		# daylight savings time used by RTC
 option		NTP		# High precision timekeeping support
 
 option		SWAPPAGER	# paging; REQUIRED
@@ -56,8 +56,8 @@ option		QUOTA		# UFS quotas
 #option		LFS		# log-structured file system
 option		MFS		# memory file system
 
-#option		NFSCLIENT	# Network File System client
-#option		NFSSERVER	# Network File System server
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
 
 option		CD9660		# ISO 9660 + Rock Ridge file system
 option		MSDOSFS		# MS-DOS file system
diff --git a/sys/arch/i386/conf/SARUMAN b/sys/arch/i386/conf/SARUMAN
new file mode 100644
index 00000000000..58d80012b6a
--- /dev/null
+++ b/sys/arch/i386/conf/SARUMAN
@@ -0,0 +1,114 @@
+#
+#	SARUMAN -- i486DX/50 EISA bus
+#
+#	$OpenBSD: SARUMAN,v 1.1 1996/11/05 03:57:16 tholo Exp $
+#
+
+machine		i386		# architecture, used by config; REQUIRED
+
+#option		I386_CPU	# CPU classes; at least one is REQUIRED
+option		I486_CPU
+#option		I586_CPU
+#option		GPL_MATH_EMULATE	# floating point emulation
+
+option		EISAVERBOSE	# verbose EISA device information
+
+option		DUMMY_NOPS	# speed hack; recommanded
+option		XSERVER
+#option		INSECURE	# insecure; allow /dev/mem writing for X
+
+maxusers	32		# estimated number of users
+option		TIMEZONE=480	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
+option		NTP		# High precision timekeeping support
+
+option		SWAPPAGER	# paging; REQUIRED
+option		DEVPAGER	# mmap() of devices
+
+option		DDB		# in-kernel debugger
+#makeoptions	DEBUG="-g"	# compile full symbol table
+option		DIAGNOSTIC	# internally consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+option		COMPAT_09	# NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_11	# NetBSD 1.1,
+option		COMPAT_43	# and 4.3BSD
+#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+#option		COMPAT_SVR4	# binary compatibility with SVR4
+#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#option		COMPAT_LINUX	# binary compatibility with Linux
+option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+
+#option		USER_LDT	# user-settable LDT; used by WINE
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+#option		QUOTA		# UFS quotas
+#option		LFS		# log-structured file system
+option		MFS		# memory file system
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
+
+#option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+#option		PORTAL		# ?
+option		PROCFS		# /proc
+#option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+#option		IMP		# missing files
+#option		NS		# XNS
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
+
+config		bsd	root on wd0a swap on wd0b dumps on wd0b
+
+mainbus0 at root
+
+isa0	at mainbus0
+eisa0	at mainbus0
+
+npx0	at isa?	port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
+
+pc0	at isa? port 0x60 irq 1		# generic PC console device
+#vt0	at isa? port 0x60 irq 1
+
+com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+com1	at isa? port 0x2f8 irq 3
+
+lpt0	at isa? port 0x378		# standard PC parallel ports
+
+joy0	at isa? port 0x201		# Game port
+
+fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controller
+fd*	at fdc? drive ?
+
+wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
+wd*	at wdc? drive ?
+
+ep0	at isa? port ? irq ?		# 3C509 ethernet cards
+
+spkr0	at pckbd?			# PC speaker
+
+pseudo-device	loop		1	# network loopback
+pseudo-device	bpfilter	8	# packet filter
+
+pseudo-device	pty		64	# pseudo-terminals
+pseudo-device	vnd		4	# paging to files
diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
index 514c62c3c09..03cae566d3f 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -24,7 +24,7 @@ RM=	rm -f
 
 ALL=	boat-anchor.cf chimera.cf pain.cf sun-lamp.cf trinity.cf \
 	clientproto.cf netbsd-proto.cf tcpproto.cf uucpproto.cf \
-	gandalf.cf
+	gandalf.cf saruman.cf
 
 all: $(ALL)