From bb992823708e5c711e79616ae4f06873e3e6201f Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@NetBSD.org>
Date: Sat, 24 Dec 2005 12:59:21 +0000
Subject: [PATCH] Merge fstab.tmpfs into fstab.ramdisk so that the file names
 represent concepts rather than specific file systems.  Suggested by hubertf@.

---
 distrib/sets/lists/misc/mi         |  4 ++--
 share/examples/fstab/Makefile      |  3 +--
 share/examples/fstab/fstab.ramdisk | 31 +++++++++++++++++++++++++++---
 share/examples/fstab/fstab.tmpfs   | 17 ----------------
 4 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 share/examples/fstab/fstab.tmpfs

diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index a340bdb9d6bd..a1ea09c23557 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.128 2005/10/11 13:40:21 peter Exp $
+# $NetBSD: mi,v 1.129 2005/12/24 12:59:21 jmmv Exp $
 ./etc/mtree/set.misc				misc-sys-root
 ./usr/share/dict/README				misc-reference-share	share
 ./usr/share/dict/american			misc-reference-share	share
@@ -503,7 +503,7 @@
 ./usr/share/examples/fstab/fstab.sd0.2		misc-fstab-examples	share
 ./usr/share/examples/fstab/fstab.sd0.amiga	misc-fstab-examples	share
 ./usr/share/examples/fstab/fstab.sd0.atari	misc-fstab-examples	share
-./usr/share/examples/fstab/fstab.tmpfs		misc-fstab-examples	share
+./usr/share/examples/fstab/fstab.tmpfs		misc-obsolete		obsolete
 ./usr/share/examples/fstab/fstab.wd0.1		misc-fstab-examples	share
 ./usr/share/examples/fstab/fstab.wd0.2		misc-fstab-examples	share
 ./usr/share/examples/fstab/fstab.wd0.3		misc-fstab-examples	share
diff --git a/share/examples/fstab/Makefile b/share/examples/fstab/Makefile
index adb420447d3b..e58789cea516 100644
--- a/share/examples/fstab/Makefile
+++ b/share/examples/fstab/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2005/09/30 12:55:13 simonb Exp $
+#	$NetBSD: Makefile,v 1.5 2005/12/24 12:59:21 jmmv Exp $
 
 NOOBJ=	# defined
 
@@ -12,7 +12,6 @@ FILES=	fstab.cdrom \
 	fstab.ramdisk \
 	fstab.rd \
 	fstab.sd0.1 fstab.sd0.2 fstab.sd0.amiga fstab.sd0.atari \
-	fstab.tmpfs \
 	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.ramdisk b/share/examples/fstab/fstab.ramdisk
index e9fc03c7fbb4..87231c165286 100644
--- a/share/examples/fstab/fstab.ramdisk
+++ b/share/examples/fstab/fstab.ramdisk
@@ -1,7 +1,32 @@
-#	$NetBSD: fstab.ramdisk,v 1.3 2005/11/27 14:11:44 sketch Exp $
+#	$NetBSD: fstab.ramdisk,v 1.4 2005/12/24 12:59:21 jmmv Exp $
 #
-# Sample fstab for ramdisk (mfs) based /tmp filesystem.
+# Sample fstab for multiple ramdisks (mfs and tmpfs).
+#
+
+#
+# mfs examples
+#
+
 # /tmp is on a 5MB mfs partition; see mount_mfs(8) for details.
 # Adjust the size according to the amount of free RAM.
+swap	/tmp	mfs	rw,-s=5m,nodev,nosuid
+
 #
-swap		/tmp	mfs	rw,-s=5m,nodev,nosuid
+# tmpfs examples
+#
+
+# Standard tmpfs entry for /tmp.
+tmpfs	/tmp		tmpfs	rw
+
+# Standard tmpfs entry for /var/run.
+#tmpfs	/var/run	tmpfs	rw
+# Note that for this to work correctly you must add /var/run to the list
+# of critical local file systems in /etc/rc.conf.  You can do so by adding
+# the following to that file:
+#critical_filesystems_local="${critical_filesystems_local} /var/run"
+
+# Mounts tmpfs over /tmp with a size limit.
+#tmpfs	/tmp		tmpfs	rw,-s128M
+
+# Mounts a tmpfs instance to be used by a specific user.
+#tmpfs	/home/foo/tmp	tmpfs	rw,-ufoo,-gusers,-s50M
diff --git a/share/examples/fstab/fstab.tmpfs b/share/examples/fstab/fstab.tmpfs
deleted file mode 100644
index 6b50f9bd03cf..000000000000
--- a/share/examples/fstab/fstab.tmpfs
+++ /dev/null
@@ -1,17 +0,0 @@
-#	$NetBSD: fstab.tmpfs,v 1.2 2005/10/03 19:56:04 jmmv Exp $
-
-# Standard tmpfs entry for /tmp.
-tmpfs	/tmp		tmpfs	rw
-
-# Standard tmpfs entry for /var/run.
-#tmpfs	/var/run	tmpfs	rw
-# Note that for this to work correctly you must add /var/run to the list
-# of critical local file systems in /etc/rc.conf.  You can do so by adding
-# the following to that file:
-#critical_filesystems_local="${critical_filesystems_local} /var/run"
-
-# Mounts tmpfs over /tmp with a size limit.
-#tmpfs	/tmp		tmpfs	rw,-s128M
-
-# Mounts a tmpfs instance to be used by a specific user.
-#tmpfs	/home/foo/tmp	tmpfs	rw,-ufoo,-gusers,-s50M