From 9ee7752f6fcaa00d9e392024591c694a5becca39 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@NetBSD.org>
Date: Sun, 3 Apr 2005 14:12:14 +0000
Subject: [PATCH] Extract commonly used things like CDROMs, pseudo-filesystems
 (/proc, ...) and mfs-based /tmp into their own files. Hint at them in the
 existing files. (fstab needs an #include statement :)

---
 share/examples/fstab/Makefile         |  8 ++++----
 share/examples/fstab/fstab.cdrom      |  2 ++
 share/examples/fstab/fstab.md         |  3 ---
 share/examples/fstab/fstab.nfs.1      |  7 ++++++-
 share/examples/fstab/fstab.nfs.2      |  9 ++++++---
 share/examples/fstab/fstab.nfs.3      |  9 ++++++---
 share/examples/fstab/fstab.pseudo     |  5 +++++
 share/examples/fstab/fstab.ra         |  7 ++++++-
 share/examples/fstab/fstab.ramdisk    |  7 +++++++
 share/examples/fstab/fstab.rd         | 10 ++++++----
 share/examples/fstab/fstab.sd0.1      | 12 ++++++------
 share/examples/fstab/fstab.sd0.2      |  7 ++++++-
 share/examples/fstab/fstab.sd0.amiga  | 14 +++++++-------
 share/examples/fstab/fstab.sd0.atari  | 11 ++++++-----
 share/examples/fstab/fstab.wd0.1      |  9 ++++++---
 share/examples/fstab/fstab.wd0.2      |  9 ++++++---
 share/examples/fstab/fstab.wd0.3      | 12 ++++++------
 share/examples/fstab/fstab.wd0.cobalt |  7 ++++++-
 18 files changed, 97 insertions(+), 51 deletions(-)
 create mode 100644 share/examples/fstab/fstab.cdrom
 delete mode 100644 share/examples/fstab/fstab.md
 create mode 100644 share/examples/fstab/fstab.pseudo
 create mode 100644 share/examples/fstab/fstab.ramdisk

diff --git a/share/examples/fstab/Makefile b/share/examples/fstab/Makefile
index 2ea6c692b547..5c87b8f34898 100644
--- a/share/examples/fstab/Makefile
+++ b/share/examples/fstab/Makefile
@@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2002/05/04 19:44:34 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 
 NOOBJ=	# defined
 
 .include <bsd.own.mk>
 
 .if ${MKSHARE} != "no"
-FILES=	fstab.md fstab.nfs.1 fstab.nfs.2 fstab.nfs.3 fstab.ra fstab.rd \
-	fstab.sd0.1 fstab.sd0.2 fstab.sd0.amiga fstab.sd0.atari fstab.wd0.1 \
-	fstab.wd0.2 fstab.wd0.3 fstab.wd0.cobalt
+FILES=	fstab.cdrom fstab.nfs.1 fstab.nfs.2 fstab.nfs.3 fstab.pseudo fstab.ra \
+	fstab.ramdisk fstab.rd fstab.sd0.1 fstab.sd0.2 fstab.sd0.amiga \
+	fstab.sd0.atari fstab.wd0.1 fstab.wd0.2 fstab.wd0.3 fstab.wd0.cobalt
 FILESDIR=/usr/share/examples/fstab
 .endif
 
diff --git a/share/examples/fstab/fstab.cdrom b/share/examples/fstab/fstab.cdrom
new file mode 100644
index 000000000000..1250125236ad
--- /dev/null
+++ b/share/examples/fstab/fstab.cdrom
@@ -0,0 +1,2 @@
+#	$NetBSD: fstab.cdrom,v 1.1 2005/04/03 14:12:14 hubertf Exp $
+/dev/cd0a	/cdrom	cd9660	ro,noauto	0 0
diff --git a/share/examples/fstab/fstab.md b/share/examples/fstab/fstab.md
deleted file mode 100644
index c81c8f213a84..000000000000
--- a/share/examples/fstab/fstab.md
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: fstab.md,v 1.1 2002/05/04 19:44:34 jdolecek Exp $
-/kern	/kern	kernfs	rw	0 0
-/proc	/proc	procfs	rw	0 0
diff --git a/share/examples/fstab/fstab.nfs.1 b/share/examples/fstab/fstab.nfs.1
index e2a9d95c00ce..3462141eeff7 100644
--- a/share/examples/fstab/fstab.nfs.1
+++ b/share/examples/fstab/fstab.nfs.1
@@ -1,7 +1,12 @@
-#	$NetBSD: fstab.nfs.1,v 1.1 2002/05/04 19:44:34 jdolecek Exp $
+#	$NetBSD: fstab.nfs.1,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 # 
 # Sample fstab for diskless clients using NFS, using reduced
 # read and write data size.
 #
 server:/export/netbsd.arch/root / nfs rw,-r=1024,-w=1024
 server:/export/netbsd.arch/usr /usr nfs ro,-r=1024,-w=1024
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.nfs.2 b/share/examples/fstab/fstab.nfs.2
index 0185874510bf..0f2c273183c0 100644
--- a/share/examples/fstab/fstab.nfs.2
+++ b/share/examples/fstab/fstab.nfs.2
@@ -1,7 +1,10 @@
-#	$NetBSD: fstab.nfs.2,v 1.1 2002/05/04 19:44:34 jdolecek Exp $
+#	$NetBSD: fstab.nfs.2,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab file for diskless clients using NFS. 
 #
 server:/export/arch/root	/	nfs	rw
-procfs				/proc	procfs	rw
-kernfs				/kern	kernfs	rw
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.nfs.3 b/share/examples/fstab/fstab.nfs.3
index 8019dc045fb8..8e824feb5cf9 100644
--- a/share/examples/fstab/fstab.nfs.3
+++ b/share/examples/fstab/fstab.nfs.3
@@ -1,4 +1,4 @@
-#	$NetBSD: fstab.nfs.3,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.nfs.3,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab for NFS based system
 # see fstab(5) for details on what the fields mean
@@ -6,8 +6,11 @@
 # All swap devices are now configured by swapctl(8), so a swap entry
 # is now needed for all swap partitions so that the "swapctl -A" in
 # /etc/rc will find them, or you will have no swap space.
-# /tmp is on a 10M mfs partition; see mount_mfs(8) for details.
 #
 nfs-server:/export/root/arch	/       nfs     rw,auto		0 0
 nfs-server:/export/swap/mynext	none	swap	sw,nfsmntpt=/swap 0 0
-swap				/tmp	mfs	rw,-s=10m	0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.pseudo b/share/examples/fstab/fstab.pseudo
new file mode 100644
index 000000000000..e79c7da39aa0
--- /dev/null
+++ b/share/examples/fstab/fstab.pseudo
@@ -0,0 +1,5 @@
+#	$NetBSD: fstab.pseudo,v 1.1 2005/04/03 14:12:14 hubertf Exp $
+/kern	/kern		kernfs	rw		0 0
+/proc	/proc		procfs	rw		0 0
+fdesc	/dev		fdesc   ro,-o=union	0 0
+ptyfs	/dev/pts	ptyfs	rw		0 0
diff --git a/share/examples/fstab/fstab.ra b/share/examples/fstab/fstab.ra
index 60fed07377a2..12a71fa81f9b 100644
--- a/share/examples/fstab/fstab.ra
+++ b/share/examples/fstab/fstab.ra
@@ -1,7 +1,12 @@
-#	$NetBSD: fstab.ra,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.ra,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab config for VAX ra(4) disks.
 #
 /dev/ra0a	/		ffs	rw 1 1
 /dev/ra0g	/mnt		ffs	rw 1 3
 /dev/ra0h	/usr		ffs	rw 1 2
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.ramdisk b/share/examples/fstab/fstab.ramdisk
new file mode 100644
index 000000000000..734eeb763210
--- /dev/null
+++ b/share/examples/fstab/fstab.ramdisk
@@ -0,0 +1,7 @@
+#	$NetBSD: fstab.ramdisk,v 1.1 2005/04/03 14:12:14 hubertf Exp $
+#
+# Sample fstab for ramdisk (mfs) based /tmp filesystem.
+# /tmp is on a 5MB mfs partition; see mount_mfs(8) for details.
+# Adjust the size according to the ammount of free RAM.
+#
+swap		/tmp	mfs	rw,-s=5m
diff --git a/share/examples/fstab/fstab.rd b/share/examples/fstab/fstab.rd
index 61553849dabf..35033a92c98e 100644
--- a/share/examples/fstab/fstab.rd
+++ b/share/examples/fstab/fstab.rd
@@ -1,10 +1,12 @@
-#	$NetBSD: fstab.rd,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.rd,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab file for hp300 rd(4) disks.
 #
 /dev/rd0a	/	ffs	rw		1 1
 /dev/rd0e	/usr	ffs	rw		1 2
 /dev/rd0f	/var	ffs	rw		1 2
-/kern		/kern	kernfs	ro		0 0
-/proc		/proc	procfs	ro		0 0
-fdesc		/dev	fdesc   ro,-o=union	0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.sd0.1 b/share/examples/fstab/fstab.sd0.1
index 231d2655266c..49719b749a94 100644
--- a/share/examples/fstab/fstab.sd0.1
+++ b/share/examples/fstab/fstab.sd0.1
@@ -1,4 +1,4 @@
-#	$NetBSD: fstab.sd0.1,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.sd0.1,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab for SCSI disk based system
 # see fstab(5) for details on what the fields mean
@@ -6,13 +6,13 @@
 # All swap devices are now configured by swapctl(8), so a swap entry
 # is now needed for all swap partitions so that the "swapctl -A" in
 # /etc/rc will find them, or you will have no swap space.
-# /tmp is on a 16M mfs partition; see mount_mfs(8) for details.
 #
 /dev/sd0a	/	ffs	rw		1 1
 /dev/sd0b	none	swap	sw		0 0
 /dev/sd0f	/var	ffs	rw		1 2
 /dev/sd0g	/usr	ffs	rw		1 2
-swap		/tmp	mfs	rw,-s=16m	0 0 
-kernfs		/kern	kernfs	rw		0 0
-procfs		/proc	procfs	rw		0 0
-/dev/cd0a	/cdrom	cd9660	ro,noauto	0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.sd0.2 b/share/examples/fstab/fstab.sd0.2
index a165f6c04ab9..a1ba8efc1591 100644
--- a/share/examples/fstab/fstab.sd0.2
+++ b/share/examples/fstab/fstab.sd0.2
@@ -1,5 +1,10 @@
-#	$NetBSD: fstab.sd0.2,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.sd0.2,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 /dev/sd0a / ffs rw 1 1
 /dev/sd0b none swap sw 0 0
 /dev/sd0g /usr ffs rw 1 2
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.sd0.amiga b/share/examples/fstab/fstab.sd0.amiga
index 3c3ec4bf347c..732b6cdf87fe 100644
--- a/share/examples/fstab/fstab.sd0.amiga
+++ b/share/examples/fstab/fstab.sd0.amiga
@@ -1,17 +1,16 @@
-#	$NetBSD: fstab.sd0.amiga,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#	$NetBSD: fstab.sd0.amiga,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab for Amiga.
 #
 #	fast file system on / root partition (NBR\7) lowest scsi disk unit
 /dev/sd0a	/	ffs	rw		1	1
+# 	swap partition (NBS\0) SCSI ID 0:
 # All swap devices are now configured by swapctl(8), so a swap entry
 # is now needed for all swap partitions so that the "swapctl -A" in
 # /etc/rc will find them, or you will have no swap space.
 /dev/sd0b	none	swap	sw		0	0
 #	fast file system on /usr (NBU\7) next to lowest scsi disk unit
 /dev/sd0d	/usr	ffs	rw		1	2	
-#	virtual mem file system on /tmp using swap (NBS\0) scsi id 0 size 5M
-#swap		/tmp	mfs	rw,-s=5m
 #	amigados file system on /amiga (DOS/1)
 #	It is recomended that you mount it on a dir that matches the
 #	volume name and then slinks will resolve correctly. All ados
@@ -19,7 +18,8 @@
 #	offset (on media) order.  So in this example the bsd usr part is
 #	first on the disk followed by the ados.
 #/dev/sd0e	/amiga	ados	ro
-#	process file system
-#procfs	/proc	procfs	ro
-#	kernel file system
-#kernfs	/kern	kernfs	ro
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.sd0.atari b/share/examples/fstab/fstab.sd0.atari
index f2ab523a69ac..7ce3dfb0ed07 100644
--- a/share/examples/fstab/fstab.sd0.atari
+++ b/share/examples/fstab/fstab.sd0.atari
@@ -1,16 +1,17 @@
-#	$NetBSD: fstab.sd0.atari,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
+#	$NetBSD: fstab.sd0.atari,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # All swap devices are now configured by swapctl(8), so a swap entry
 # is now needed for all swap partitions so that the "swapctl -A" in
 # /etc/rc will find them, or you will have no swap space.
-# /tmp is on a 5M mfs partition; see mount_mfs(8) for details.
 # /atari is a GEMDOS filesystem (hence the '-G' flag).
 #
 #
 /dev/sd0a	/	ffs	rw		1	1
 /dev/sd0b	none	swap	sw		0	0
 /dev/sd0d	/usr	ffs	rw		1	2	
-#swap		/tmp	mfs	rw,-s=5m
 #/dev/sd0e	/atari	msdos	rw,-G
-#procfs	/proc	procfs	ro
-#kernfs	/kern	kernfs	ro
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.wd0.1 b/share/examples/fstab/fstab.wd0.1
index 4ab1f7b465b8..47560d3d2969 100644
--- a/share/examples/fstab/fstab.wd0.1
+++ b/share/examples/fstab/fstab.wd0.1
@@ -1,5 +1,8 @@
-#	$NetBSD: fstab.wd0.1,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
+#	$NetBSD: fstab.wd0.1,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 /dev/wd0a	/	ffs	rw		1 1
 #/dev/wd0b	none	swap	sw		0 0
-kernfs		/kern	kernfs	rw		0 0
-procfs		/proc	procfs	rw		0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.wd0.2 b/share/examples/fstab/fstab.wd0.2
index 9b57bb00db63..6f976b5dc074 100644
--- a/share/examples/fstab/fstab.wd0.2
+++ b/share/examples/fstab/fstab.wd0.2
@@ -1,4 +1,4 @@
-#	$NetBSD: fstab.wd0.2,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
+#	$NetBSD: fstab.wd0.2,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab for IDE disk based system
 # see fstab(5) for details on what the fields mean
@@ -10,5 +10,8 @@
 /dev/wd0a	/	ffs	rw		1 1
 /dev/wd0b	none	swap	sw		0 0
 /dev/wd0e	/usr	ffs	rw		1 2
-kernfs		/kern	kernfs	rw		0 0
-procfs		/proc	procfs	rw		0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.wd0.3 b/share/examples/fstab/fstab.wd0.3
index 961635f1c9a2..39a56cd0b440 100644
--- a/share/examples/fstab/fstab.wd0.3
+++ b/share/examples/fstab/fstab.wd0.3
@@ -1,4 +1,4 @@
-#	$NetBSD: fstab.wd0.3,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
+#	$NetBSD: fstab.wd0.3,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 #
 # Sample fstab for IDE disk based system
 # see fstab(5) for details on what the fields mean
@@ -6,13 +6,13 @@
 # All swap devices are now configured by swapctl(8), so a swap entry
 # is now needed for all swap partitions so that the "swapctl -A" in
 # /etc/rc will find them, or you will have no swap space.
-# /tmp is on a 16M mfs partition; see mount_mfs(8) for details.
 #
 /dev/wd0a	/	ffs	rw		1 1
 /dev/wd0b	none	swap	sw		0 0
 /dev/wd0f	/var	ffs	rw		1 2
 /dev/wd0g	/usr	ffs	rw		1 2
-swap		/tmp	mfs	rw,-s=16m	0 0 
-kernfs		/kern	kernfs	rw		0 0
-procfs		/proc	procfs	rw		0 0
-/dev/cd0a	/cdrom	cd9660	ro,noauto	0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk
diff --git a/share/examples/fstab/fstab.wd0.cobalt b/share/examples/fstab/fstab.wd0.cobalt
index 1a2351e755c7..bcaeebb49661 100644
--- a/share/examples/fstab/fstab.wd0.cobalt
+++ b/share/examples/fstab/fstab.wd0.cobalt
@@ -1,4 +1,9 @@
-#	$NetBSD: fstab.wd0.cobalt,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
+#	$NetBSD: fstab.wd0.cobalt,v 1.2 2005/04/03 14:12:14 hubertf Exp $
 /dev/wd0a	/	ffs	rw		1 1
 /dev/wd0e	/stand	ext2fs	rw		1 2
 /dev/wd0f	none	swap	sw		0 0
+#
+# Possibly include data from the following files here:
+# fstab.cdrom
+# fstab.pseudo
+# fstab.ramdisk