summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/sets/lists/base/mi16
-rw-r--r--distrib/sets/lists/etc/md.acorn262
-rw-r--r--distrib/sets/lists/etc/md.algor3
-rw-r--r--distrib/sets/lists/etc/md.alpha2
-rw-r--r--distrib/sets/lists/etc/md.amiga3
-rw-r--r--distrib/sets/lists/etc/md.arc3
-rw-r--r--distrib/sets/lists/etc/md.atari3
-rw-r--r--distrib/sets/lists/etc/md.bebox2
-rw-r--r--distrib/sets/lists/etc/md.cats2
-rw-r--r--distrib/sets/lists/etc/md.cobalt2
-rw-r--r--distrib/sets/lists/etc/md.evbarm2
-rw-r--r--distrib/sets/lists/etc/md.hp3004
-rw-r--r--distrib/sets/lists/etc/md.hpcmips2
-rw-r--r--distrib/sets/lists/etc/md.i3864
-rw-r--r--distrib/sets/lists/etc/md.luna68k3
-rw-r--r--distrib/sets/lists/etc/md.mac68k3
-rw-r--r--distrib/sets/lists/etc/md.macppc3
-rw-r--r--distrib/sets/lists/etc/md.mipsco2
-rw-r--r--distrib/sets/lists/etc/md.mmeye2
-rw-r--r--distrib/sets/lists/etc/md.mvme68k4
-rw-r--r--distrib/sets/lists/etc/md.mvmeppc3
-rw-r--r--distrib/sets/lists/etc/md.netwinder2
-rw-r--r--distrib/sets/lists/etc/md.news68k3
-rw-r--r--distrib/sets/lists/etc/md.newsmips2
-rw-r--r--distrib/sets/lists/etc/md.next68k3
-rw-r--r--distrib/sets/lists/etc/md.pc5323
-rw-r--r--distrib/sets/lists/etc/md.playstation22
-rw-r--r--distrib/sets/lists/etc/md.pmax2
-rw-r--r--distrib/sets/lists/etc/md.prep4
-rw-r--r--distrib/sets/lists/etc/md.sandpoint4
-rw-r--r--distrib/sets/lists/etc/md.sgimips2
-rw-r--r--distrib/sets/lists/etc/md.shark2
-rw-r--r--distrib/sets/lists/etc/md.sparc2
-rw-r--r--distrib/sets/lists/etc/md.sparc643
-rw-r--r--distrib/sets/lists/etc/md.sun24
-rw-r--r--distrib/sets/lists/etc/md.sun34
-rw-r--r--distrib/sets/lists/etc/md.vax3
-rw-r--r--distrib/sets/lists/etc/md.x68k10
-rw-r--r--distrib/sets/lists/etc/obsolete.mi14
-rw-r--r--etc/Makefile4
-rw-r--r--etc/etc.acorn26/fstab.nfs4
-rw-r--r--etc/etc.alpha/fstab.sd5
-rw-r--r--etc/etc.bebox/fstab.wd19
-rw-r--r--etc/etc.cats/fstab.wd15
-rw-r--r--etc/etc.dreamcast/fstab.md2
-rw-r--r--etc/etc.evbarm/fstab.wd14
-rw-r--r--etc/etc.evbsh3/fstab.md3
-rw-r--r--etc/etc.hp300/fstab.sd8
-rw-r--r--etc/etc.hpcmips/fstab.wd5
-rw-r--r--etc/etc.hpcsh/fstab.md3
-rw-r--r--etc/etc.i386/fstab.sd18
-rw-r--r--etc/etc.i386/fstab.wd18
-rw-r--r--etc/etc.mac68k/fstab.sd7
-rw-r--r--etc/etc.macppc/fstab.sd7
-rw-r--r--etc/etc.macppc/fstab.wd7
-rw-r--r--etc/etc.mipsco/fstab.sd5
-rw-r--r--etc/etc.mmeye/fstab.wd5
-rw-r--r--etc/etc.mvme68k/fstab.nfs4
-rw-r--r--etc/etc.mvme68k/fstab.sd7
-rw-r--r--etc/etc.mvmeppc/fstab.nfs5
-rw-r--r--etc/etc.mvmeppc/fstab.sd5
-rw-r--r--etc/etc.netwinder/fstab.wd14
-rw-r--r--etc/etc.newsmips/fstab.sd5
-rw-r--r--etc/etc.pc532/fstab.sd5
-rw-r--r--etc/etc.playstation2/fstab.wd5
-rw-r--r--etc/etc.pmax/fstab.sd5
-rw-r--r--etc/etc.prep/fstab.nfs5
-rw-r--r--etc/etc.prep/fstab.sd5
-rw-r--r--etc/etc.prep/fstab.wd5
-rw-r--r--etc/etc.sandpoint/fstab.nfs5
-rw-r--r--etc/etc.sandpoint/fstab.sd5
-rw-r--r--etc/etc.sandpoint/fstab.wd19
-rw-r--r--etc/etc.sgimips/fstab.sd5
-rw-r--r--etc/etc.shark/fstab.wd14
-rw-r--r--etc/etc.sparc/fstab.sd5
-rw-r--r--etc/etc.sparc64/fstab.sd5
-rw-r--r--etc/etc.sparc64/fstab.wd5
-rw-r--r--etc/etc.sun2/fstab.nfs4
-rw-r--r--etc/etc.sun2/fstab.sd05
-rw-r--r--etc/etc.sun3/fstab.nfs4
-rw-r--r--etc/etc.sun3/fstab.sd05
-rw-r--r--etc/etc.vax/fstab.ra5
-rw-r--r--etc/etc.walnut/fstab.wd17
-rw-r--r--etc/etc.x68k/fstab.sd011
-rw-r--r--etc/etc.x68k/fstab.sd111
-rw-r--r--etc/etc.x68k/fstab.sd211
-rw-r--r--etc/etc.x68k/fstab.sd311
-rw-r--r--etc/etc.x68k/fstab.sd411
-rw-r--r--etc/etc.x68k/fstab.sd511
-rw-r--r--etc/etc.x68k/fstab.sd611
-rw-r--r--etc/etc.x68k/fstab.sd711
-rw-r--r--share/examples/Makefile4
-rw-r--r--share/examples/fstab/Makefile14
-rw-r--r--share/examples/fstab/fstab.md3
-rw-r--r--share/examples/fstab/fstab.nfs.17
-rw-r--r--share/examples/fstab/fstab.nfs.27
-rw-r--r--share/examples/fstab/fstab.nfs.3 (renamed from etc/etc.next68k/fstab.nfs)8
-rw-r--r--share/examples/fstab/fstab.ra7
-rw-r--r--share/examples/fstab/fstab.rd (renamed from etc/etc.hp300/fstab.rd)4
-rw-r--r--share/examples/fstab/fstab.sd0.1 (renamed from etc/etc.arc/fstab.sd)2
-rw-r--r--share/examples/fstab/fstab.sd0.2 (renamed from etc/etc.news68k/fstab.sd)2
-rw-r--r--share/examples/fstab/fstab.sd0.amiga (renamed from etc/etc.amiga/fstab.tmp)3
-rw-r--r--share/examples/fstab/fstab.sd0.atari (renamed from etc/etc.atari/fstab.tmp)3
-rw-r--r--share/examples/fstab/fstab.wd0.1 (renamed from etc/etc.hpcsh/fstab.wd)2
-rw-r--r--share/examples/fstab/fstab.wd0.2 (renamed from etc/etc.acorn32/fstab.wd)2
-rw-r--r--share/examples/fstab/fstab.wd0.3 (renamed from etc/etc.arc/fstab.wd)2
-rw-r--r--share/examples/fstab/fstab.wd0.cobalt (renamed from etc/etc.cobalt/fstab.wd)3
107 files changed, 99 insertions, 523 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index b858e101ca2..aa4784a549e 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.319 2002/05/02 17:03:57 wiz Exp $
+# $NetBSD: mi,v 1.320 2002/05/04 19:43:58 jdolecek Exp $
. base-sys-root
./altroot base-sys-root
./bin base-sys-root
@@ -915,6 +915,20 @@
./usr/share/examples/emul/svr4/etc base-sys-examples
./usr/share/examples/emul/ultrix base-sys-examples
./usr/share/examples/emul/ultrix/etc base-sys-examples
+./usr/share/examples/fstab/fstab.md base-fstab-examples
+./usr/share/examples/fstab/fstab.nfs.1 base-fstab-examples
+./usr/share/examples/fstab/fstab.nfs.2 base-fstab-examples
+./usr/share/examples/fstab/fstab.nfs.3 base-fstab-examples
+./usr/share/examples/fstab/fstab.ra base-fstab-examples
+./usr/share/examples/fstab/fstab.rd base-fstab-examples
+./usr/share/examples/fstab/fstab.sd0.1 base-fstab-examples
+./usr/share/examples/fstab/fstab.sd0.2 base-fstab-examples
+./usr/share/examples/fstab/fstab.sd0.amiga base-fstab-examples
+./usr/share/examples/fstab/fstab.sd0.atari base-fstab-examples
+./usr/share/examples/fstab/fstab.wd0.1 base-fstab-examples
+./usr/share/examples/fstab/fstab.wd0.2 base-fstab-examples
+./usr/share/examples/fstab/fstab.wd0.3 base-fstab-examples
+./usr/share/examples/fstab/fstab.wd0.cobalt base-fstab-examples
./usr/share/examples/ftpd base-netutil-examples
./usr/share/examples/ipf base-netutil-examples
./usr/share/examples/isdn base-isdn-examples
diff --git a/distrib/sets/lists/etc/md.acorn26 b/distrib/sets/lists/etc/md.acorn26
deleted file mode 100644
index dbf18040a11..00000000000
--- a/distrib/sets/lists/etc/md.acorn26
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.acorn26,v 1.1 2002/03/24 22:21:05 bjh21 Exp $
-./etc/fstab.nfs etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.algor b/distrib/sets/lists/etc/md.algor
deleted file mode 100644
index 347813847e9..00000000000
--- a/distrib/sets/lists/etc/md.algor
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.algor,v 1.1 2001/08/25 16:21:24 thorpej Exp $
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.alpha b/distrib/sets/lists/etc/md.alpha
deleted file mode 100644
index b41fd88f746..00000000000
--- a/distrib/sets/lists/etc/md.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.alpha,v 1.3 2001/01/26 01:39:16 jwise Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.amiga b/distrib/sets/lists/etc/md.amiga
index 9e236142172..9c487fc67b4 100644
--- a/distrib/sets/lists/etc/md.amiga
+++ b/distrib/sets/lists/etc/md.amiga
@@ -1,3 +1,2 @@
-# $NetBSD: md.amiga,v 1.4 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.tmp etc-sys-etc
+# $NetBSD: md.amiga,v 1.5 2002/05/04 19:44:27 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.arc b/distrib/sets/lists/etc/md.arc
deleted file mode 100644
index 24ef37817f1..00000000000
--- a/distrib/sets/lists/etc/md.arc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.arc,v 1.2 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.atari b/distrib/sets/lists/etc/md.atari
index 4acb7011c56..95f54096af7 100644
--- a/distrib/sets/lists/etc/md.atari
+++ b/distrib/sets/lists/etc/md.atari
@@ -1,3 +1,2 @@
-# $NetBSD: md.atari,v 1.4 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.tmp etc-sys-etc
+# $NetBSD: md.atari,v 1.5 2002/05/04 19:44:27 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.bebox b/distrib/sets/lists/etc/md.bebox
deleted file mode 100644
index 8913975f197..00000000000
--- a/distrib/sets/lists/etc/md.bebox
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.bebox,v 1.5 2001/04/12 02:40:45 briggs Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.cats b/distrib/sets/lists/etc/md.cats
deleted file mode 100644
index c6768ae5980..00000000000
--- a/distrib/sets/lists/etc/md.cats
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.cats,v 1.1 2002/03/31 21:13:24 thorpej Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.cobalt b/distrib/sets/lists/etc/md.cobalt
deleted file mode 100644
index 1ae5bd34247..00000000000
--- a/distrib/sets/lists/etc/md.cobalt
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.cobalt,v 1.2 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.evbarm b/distrib/sets/lists/etc/md.evbarm
deleted file mode 100644
index 41a7670b655..00000000000
--- a/distrib/sets/lists/etc/md.evbarm
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.evbarm,v 1.1 2001/11/25 23:41:22 thorpej Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.hp300 b/distrib/sets/lists/etc/md.hp300
index 38d3e4cc658..3bb7a99766e 100644
--- a/distrib/sets/lists/etc/md.hp300
+++ b/distrib/sets/lists/etc/md.hp300
@@ -1,4 +1,2 @@
-# $NetBSD: md.hp300,v 1.4 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.rd etc-sys-etc
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.hp300,v 1.5 2002/05/04 19:44:28 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.hpcmips b/distrib/sets/lists/etc/md.hpcmips
deleted file mode 100644
index b2ddac117a7..00000000000
--- a/distrib/sets/lists/etc/md.hpcmips
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.hpcmips,v 1.2 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.i386 b/distrib/sets/lists/etc/md.i386
index 0c71ad5c9c6..d1fbc9640de 100644
--- a/distrib/sets/lists/etc/md.i386
+++ b/distrib/sets/lists/etc/md.i386
@@ -1,5 +1,3 @@
-# $NetBSD: md.i386,v 1.8 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
+# $NetBSD: md.i386,v 1.9 2002/05/04 19:44:29 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
./etc/ttyaction etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.luna68k b/distrib/sets/lists/etc/md.luna68k
index 38f34044e7a..4b50e841c8b 100644
--- a/distrib/sets/lists/etc/md.luna68k
+++ b/distrib/sets/lists/etc/md.luna68k
@@ -1,3 +1,2 @@
-# $NetBSD: md.luna68k,v 1.2 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.luna68k,v 1.3 2002/05/04 19:44:29 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.mac68k b/distrib/sets/lists/etc/md.mac68k
index 5ce719c2749..08538de5ff2 100644
--- a/distrib/sets/lists/etc/md.mac68k
+++ b/distrib/sets/lists/etc/md.mac68k
@@ -1,3 +1,2 @@
-# $NetBSD: md.mac68k,v 1.4 2001/01/26 01:39:17 jwise Exp $
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.mac68k,v 1.5 2002/05/04 19:44:29 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.macppc b/distrib/sets/lists/etc/md.macppc
deleted file mode 100644
index ce4b821639a..00000000000
--- a/distrib/sets/lists/etc/md.macppc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.macppc,v 1.6 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.mipsco b/distrib/sets/lists/etc/md.mipsco
deleted file mode 100644
index ca5ffe03f21..00000000000
--- a/distrib/sets/lists/etc/md.mipsco
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.mipsco,v 1.1 2001/02/19 07:35:43 wdk Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.mmeye b/distrib/sets/lists/etc/md.mmeye
deleted file mode 100644
index b32f7c34add..00000000000
--- a/distrib/sets/lists/etc/md.mmeye
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.mmeye,v 1.3 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.mvme68k b/distrib/sets/lists/etc/md.mvme68k
index 6f456874294..9f52c29a577 100644
--- a/distrib/sets/lists/etc/md.mvme68k
+++ b/distrib/sets/lists/etc/md.mvme68k
@@ -1,4 +1,2 @@
-# $NetBSD: md.mvme68k,v 1.5 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.mvme68k,v 1.6 2002/05/04 19:44:30 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.mvmeppc b/distrib/sets/lists/etc/md.mvmeppc
deleted file mode 100644
index 9d107de841e..00000000000
--- a/distrib/sets/lists/etc/md.mvmeppc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.mvmeppc,v 1.1 2002/02/27 21:57:10 scw Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.netwinder b/distrib/sets/lists/etc/md.netwinder
deleted file mode 100644
index 6c4c0d778b3..00000000000
--- a/distrib/sets/lists/etc/md.netwinder
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.netwinder,v 1.1 2001/11/26 03:45:47 thorpej Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.news68k b/distrib/sets/lists/etc/md.news68k
index b3d951643b5..d5dc6e8cbdf 100644
--- a/distrib/sets/lists/etc/md.news68k
+++ b/distrib/sets/lists/etc/md.news68k
@@ -1,3 +1,2 @@
-# $NetBSD: md.news68k,v 1.2 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.news68k,v 1.3 2002/05/04 19:44:31 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.newsmips b/distrib/sets/lists/etc/md.newsmips
deleted file mode 100644
index 7d872385d65..00000000000
--- a/distrib/sets/lists/etc/md.newsmips
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.newsmips,v 1.2 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.next68k b/distrib/sets/lists/etc/md.next68k
index fc66303a714..5b28be14ff4 100644
--- a/distrib/sets/lists/etc/md.next68k
+++ b/distrib/sets/lists/etc/md.next68k
@@ -1,3 +1,2 @@
-# $NetBSD: md.next68k,v 1.4 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.nfs etc-sys-etc
+# $NetBSD: md.next68k,v 1.5 2002/05/04 19:44:31 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.pc532 b/distrib/sets/lists/etc/md.pc532
index cf9153929b6..b7fd4f8b785 100644
--- a/distrib/sets/lists/etc/md.pc532
+++ b/distrib/sets/lists/etc/md.pc532
@@ -1,3 +1,2 @@
-# $NetBSD: md.pc532,v 1.4 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
+# $NetBSD: md.pc532,v 1.5 2002/05/04 19:44:31 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.playstation2 b/distrib/sets/lists/etc/md.playstation2
deleted file mode 100644
index 35e32d376c1..00000000000
--- a/distrib/sets/lists/etc/md.playstation2
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.playstation2,v 1.1 2001/10/15 16:22:51 uch Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.pmax b/distrib/sets/lists/etc/md.pmax
deleted file mode 100644
index d2b276036cf..00000000000
--- a/distrib/sets/lists/etc/md.pmax
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.pmax,v 1.6 2001/09/01 02:36:51 chs Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.prep b/distrib/sets/lists/etc/md.prep
deleted file mode 100644
index 2377b820c8a..00000000000
--- a/distrib/sets/lists/etc/md.prep
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: md.prep,v 1.2 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sandpoint b/distrib/sets/lists/etc/md.sandpoint
deleted file mode 100644
index 3f1ef14f964..00000000000
--- a/distrib/sets/lists/etc/md.sandpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: md.sandpoint,v 1.2 2002/04/14 09:48:50 bjh21 Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sgimips b/distrib/sets/lists/etc/md.sgimips
deleted file mode 100644
index be373217314..00000000000
--- a/distrib/sets/lists/etc/md.sgimips
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.sgimips,v 1.1 2001/08/29 20:32:30 he Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.shark b/distrib/sets/lists/etc/md.shark
deleted file mode 100644
index e4189583e29..00000000000
--- a/distrib/sets/lists/etc/md.shark
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.shark,v 1.2 2002/03/30 06:29:02 thorpej Exp $
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sparc b/distrib/sets/lists/etc/md.sparc
deleted file mode 100644
index 42f1eec541c..00000000000
--- a/distrib/sets/lists/etc/md.sparc
+++ /dev/null
@@ -1,2 +0,0 @@
-# $NetBSD: md.sparc,v 1.5 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sparc64 b/distrib/sets/lists/etc/md.sparc64
deleted file mode 100644
index 7dd73a02045..00000000000
--- a/distrib/sets/lists/etc/md.sparc64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.sparc64,v 1.3 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd etc-sys-etc
-./etc/fstab.wd etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sun2 b/distrib/sets/lists/etc/md.sun2
index 70a9edab441..6578c1577a0 100644
--- a/distrib/sets/lists/etc/md.sun2
+++ b/distrib/sets/lists/etc/md.sun2
@@ -1,5 +1,3 @@
-# $NetBSD: md.sun2,v 1.1 2001/05/18 00:16:37 fredette Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd0 etc-sys-etc
+# $NetBSD: md.sun2,v 1.2 2002/05/04 19:44:33 jdolecek Exp $
#./etc/ld.so.conf etc-sys-etc
./etc/ttyaction etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.sun3 b/distrib/sets/lists/etc/md.sun3
index 7b61d64bdb1..6e239a1c2b6 100644
--- a/distrib/sets/lists/etc/md.sun3
+++ b/distrib/sets/lists/etc/md.sun3
@@ -1,5 +1,3 @@
-# $NetBSD: md.sun3,v 1.7 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.nfs etc-sys-etc
-./etc/fstab.sd0 etc-sys-etc
+# $NetBSD: md.sun3,v 1.8 2002/05/04 19:44:33 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
./etc/ttyaction etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.vax b/distrib/sets/lists/etc/md.vax
index 54cd2c0cae2..a2a4ad36085 100644
--- a/distrib/sets/lists/etc/md.vax
+++ b/distrib/sets/lists/etc/md.vax
@@ -1,3 +1,2 @@
-# $NetBSD: md.vax,v 1.5 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.ra etc-sys-etc
+# $NetBSD: md.vax,v 1.6 2002/05/04 19:44:34 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/md.x68k b/distrib/sets/lists/etc/md.x68k
index efa11b2cd5d..fd0ba72f0e9 100644
--- a/distrib/sets/lists/etc/md.x68k
+++ b/distrib/sets/lists/etc/md.x68k
@@ -1,10 +1,2 @@
-# $NetBSD: md.x68k,v 1.4 2001/01/26 01:39:18 jwise Exp $
-./etc/fstab.sd0 etc-sys-etc
-./etc/fstab.sd1 etc-sys-etc
-./etc/fstab.sd2 etc-sys-etc
-./etc/fstab.sd3 etc-sys-etc
-./etc/fstab.sd4 etc-sys-etc
-./etc/fstab.sd5 etc-sys-etc
-./etc/fstab.sd6 etc-sys-etc
-./etc/fstab.sd7 etc-sys-etc
+# $NetBSD: md.x68k,v 1.5 2002/05/04 19:44:34 jdolecek Exp $
./etc/ld.so.conf etc-sys-etc
diff --git a/distrib/sets/lists/etc/obsolete.mi b/distrib/sets/lists/etc/obsolete.mi
index 7c5098f2fa1..0f1f92e722b 100644
--- a/distrib/sets/lists/etc/obsolete.mi
+++ b/distrib/sets/lists/etc/obsolete.mi
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.9 2002/04/04 08:46:11 wiz Exp $
+# $NetBSD: obsolete.mi,v 1.10 2002/05/04 19:44:34 jdolecek Exp $
/etc/default/daily.conf
/etc/default/monthly.conf
/etc/default/rc.conf
@@ -13,3 +13,15 @@
/etc/rc.d/systemfs
/etc/rc.d/xntpd
/etc/rc.wscons
+/etc/fstab.nfs
+/etc/fstab.sd
+/etc/fstab.sd0
+/etc/fstab.sd1
+/etc/fstab.sd2
+/etc/fstab.sd3
+/etc/fstab.sd4
+/etc/fstab.sd5
+/etc/fstab.sd6
+/etc/fstab.sd7
+/etc/fstab.tmp
+/etc/fstab.wd
diff --git a/etc/Makefile b/etc/Makefile
index 9583189fb58..7c147d354f0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2002/05/02 22:13:31 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.219 2002/05/04 19:43:57 jdolecek Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -246,8 +246,6 @@ install-etc-files: check_DESTDIR
${DESTDIR}/var/games/larn/lscore12.0
${INSTALL_FILE} -o games -g games -m 664 /dev/null \
${DESTDIR}/var/games/larn/playerids
- (cd etc.${MACHINE}; ${INSTALL_FILE} -o ${BINOWN} \
- -g ${BINGRP} -m 444 fstab.* ${DESTDIR}/etc)
(cd skel; ${MAKE} distribution)
(cd ../usr.bin/mail; ${MAKE} distribution)
(cd ../gnu/usr.sbin/postfix/; ${MAKE} distribution)
diff --git a/etc/etc.acorn26/fstab.nfs b/etc/etc.acorn26/fstab.nfs
deleted file mode 100644
index b7e547f81ed..00000000000
--- a/etc/etc.acorn26/fstab.nfs
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.1 2002/03/24 21:20:41 bjh21 Exp $
-#
-server:/export/client/root / nfs rw,-r=1024,-w=1024
-server:/export/netbsd.acorn26/usr /usr nfs ro,-r=1024,-w=1024
diff --git a/etc/etc.alpha/fstab.sd b/etc/etc.alpha/fstab.sd
deleted file mode 100644
index 0374f3336dc..00000000000
--- a/etc/etc.alpha/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.3 1998/01/09 06:09:38 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0d /usr ffs rw 1 2
diff --git a/etc/etc.bebox/fstab.wd b/etc/etc.bebox/fstab.wd
deleted file mode 100644
index 0ed2a992c90..00000000000
--- a/etc/etc.bebox/fstab.wd
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: fstab.wd,v 1.2 2001/11/26 16:34:57 lukem Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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.
-# the CD-ROM entry is commented out because IDE controller based
-# machines often do not have SCSI CD devices.
-#
-/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=10m 0 0
-kernfs /kern kernfs rw 0 0
-procfs /proc procfs rw 0 0
diff --git a/etc/etc.cats/fstab.wd b/etc/etc.cats/fstab.wd
deleted file mode 100644
index 895f39aae4d..00000000000
--- a/etc/etc.cats/fstab.wd
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2002/01/23 15:41:43 skrll Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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/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
-swap /tmp mfs rw,-s=10m 0 0
diff --git a/etc/etc.dreamcast/fstab.md b/etc/etc.dreamcast/fstab.md
deleted file mode 100644
index 6d234aa3672..00000000000
--- a/etc/etc.dreamcast/fstab.md
+++ /dev/null
@@ -1,2 +0,0 @@
-/kern /kern kernfs rw 0 0
-/proc /proc procfs rw 0 0
diff --git a/etc/etc.evbarm/fstab.wd b/etc/etc.evbarm/fstab.wd
deleted file mode 100644
index 7793fd59308..00000000000
--- a/etc/etc.evbarm/fstab.wd
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2001/11/10 18:55:53 thorpej Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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/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
diff --git a/etc/etc.evbsh3/fstab.md b/etc/etc.evbsh3/fstab.md
deleted file mode 100644
index 7850d6ab85a..00000000000
--- a/etc/etc.evbsh3/fstab.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: fstab.md,v 1.2 2002/03/11 11:29:29 simonb Exp $
-/kern /kern kernfs rw 0 0
-/proc /proc procfs rw 0 0
diff --git a/etc/etc.hp300/fstab.sd b/etc/etc.hp300/fstab.sd
deleted file mode 100644
index 0c79deab17f..00000000000
--- a/etc/etc.hp300/fstab.sd
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: fstab.sd,v 1.2 1998/01/09 06:09:39 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0e /var ffs rw 1 2
-/dev/sd0f /usr ffs rw 1 2
-/kern /kern kernfs ro 0 0
-/proc /proc procfs ro 0 0
-fdesc /dev fdesc ro,-o=union 0 0
diff --git a/etc/etc.hpcmips/fstab.wd b/etc/etc.hpcmips/fstab.wd
deleted file mode 100644
index 4938ccc8894..00000000000
--- a/etc/etc.hpcmips/fstab.wd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1.1.1 1999/09/16 12:18:27 takemura 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
diff --git a/etc/etc.hpcsh/fstab.md b/etc/etc.hpcsh/fstab.md
deleted file mode 100644
index e29de9f810e..00000000000
--- a/etc/etc.hpcsh/fstab.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: fstab.md,v 1.2 2001/02/28 15:44:25 uch Exp $
-/kern /kern kernfs rw 0 0
-/proc /proc procfs rw 0 0
diff --git a/etc/etc.i386/fstab.sd b/etc/etc.i386/fstab.sd
deleted file mode 100644
index 2079180fd6b..00000000000
--- a/etc/etc.i386/fstab.sd
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: fstab.sd,v 1.3 2001/11/26 16:34:57 lukem Exp $
-#
-# Sample fstab for SCSI disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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.
-#
-/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=10m 0 0
-kernfs /kern kernfs rw 0 0
-procfs /proc procfs rw 0 0
-/dev/cd0a /cdrom cd9660 ro,noauto 0 0
diff --git a/etc/etc.i386/fstab.wd b/etc/etc.i386/fstab.wd
deleted file mode 100644
index a6b0216bad4..00000000000
--- a/etc/etc.i386/fstab.wd
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: fstab.wd,v 1.6 2001/11/26 16:34:57 lukem Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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.
-#
-/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=10m 0 0
-kernfs /kern kernfs rw 0 0
-procfs /proc procfs rw 0 0
-/dev/cd0a /cdrom cd9660 ro,noauto 0 0
diff --git a/etc/etc.mac68k/fstab.sd b/etc/etc.mac68k/fstab.sd
deleted file mode 100644
index 4e8fb83c840..00000000000
--- a/etc/etc.mac68k/fstab.sd
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: fstab.sd,v 1.3 1998/01/09 06:09:40 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-#/dev/sd0g /usr ffs rw 1 2
-kern /kern kernfs rw 0 0
-proc /proc procfs rw 0 0
diff --git a/etc/etc.macppc/fstab.sd b/etc/etc.macppc/fstab.sd
deleted file mode 100644
index de8e6a408c8..00000000000
--- a/etc/etc.macppc/fstab.sd
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 1998/06/26 12:06:39 tsubai Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
-#kern /kern kernfs rw 0 0
-#proc /proc procfs rw 0 0
diff --git a/etc/etc.macppc/fstab.wd b/etc/etc.macppc/fstab.wd
deleted file mode 100644
index 19f92474768..00000000000
--- a/etc/etc.macppc/fstab.wd
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2000/06/12 23:06:59 matt Exp $
-#
-/dev/wd0a / ffs rw 1 1
-/dev/wd0b none swap sw 0 0
-/dev/wd0g /usr ffs rw 1 2
-#kern /kern kernfs rw 0 0
-#proc /proc procfs rw 0 0
diff --git a/etc/etc.mipsco/fstab.sd b/etc/etc.mipsco/fstab.sd
deleted file mode 100644
index 5b7c33be21d..00000000000
--- a/etc/etc.mipsco/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2000/09/18 11:00:33 wdk Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.mmeye/fstab.wd b/etc/etc.mmeye/fstab.wd
deleted file mode 100644
index 41c912d8120..00000000000
--- a/etc/etc.mmeye/fstab.wd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2000/01/02 10:04:26 msaitoh Exp $
-#
-/dev/wd0a / ffs rw 1 1
-/dev/wd0b none swap sw 0 0
-/dev/wd0g /usr ffs rw 1 2
diff --git a/etc/etc.mvme68k/fstab.nfs b/etc/etc.mvme68k/fstab.nfs
deleted file mode 100644
index df9c9db3b67..00000000000
--- a/etc/etc.mvme68k/fstab.nfs
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.2 1998/01/09 06:09:41 perry Exp $
-#
-nfs-server:/export/root/vme147 / nfs rw,-P 0 0
-nfs-server:/export/exec/mvme68k /usr nfs rw,-P 0 0
diff --git a/etc/etc.mvme68k/fstab.sd b/etc/etc.mvme68k/fstab.sd
deleted file mode 100644
index 521e6f92c19..00000000000
--- a/etc/etc.mvme68k/fstab.sd
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 1999/02/20 00:22:43 scw Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0d /var ffs rw 1 2
-/dev/sd0e /usr ffs rw 1 2
-/kern /kern kernfs ro 0 0
diff --git a/etc/etc.mvmeppc/fstab.nfs b/etc/etc.mvmeppc/fstab.nfs
deleted file mode 100644
index e2bfebee246..00000000000
--- a/etc/etc.mvmeppc/fstab.nfs
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.1 2002/02/27 21:17:53 scw Exp $
-#
-server:/export/mvmeppc/root / nfs rw
-procfs /proc procfs rw
-kernfs /kern kernfs rw
diff --git a/etc/etc.mvmeppc/fstab.sd b/etc/etc.mvmeppc/fstab.sd
deleted file mode 100644
index b50b22d6cdb..00000000000
--- a/etc/etc.mvmeppc/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2002/02/27 21:17:53 scw Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0d /usr ffs rw 1 2
diff --git a/etc/etc.netwinder/fstab.wd b/etc/etc.netwinder/fstab.wd
deleted file mode 100644
index 1a115884c26..00000000000
--- a/etc/etc.netwinder/fstab.wd
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2001/08/22 18:34:49 matt Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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/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
diff --git a/etc/etc.newsmips/fstab.sd b/etc/etc.newsmips/fstab.sd
deleted file mode 100644
index 7c3b8321c5f..00000000000
--- a/etc/etc.newsmips/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 1999/01/24 12:36:36 tsubai Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.pc532/fstab.sd b/etc/etc.pc532/fstab.sd
deleted file mode 100644
index 563ac981240..00000000000
--- a/etc/etc.pc532/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.3 1998/01/09 06:09:42 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0e /usr ffs rw 1 2
diff --git a/etc/etc.playstation2/fstab.wd b/etc/etc.playstation2/fstab.wd
deleted file mode 100644
index 1142a5d9c45..00000000000
--- a/etc/etc.playstation2/fstab.wd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2001/10/15 16:22:53 uch 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
diff --git a/etc/etc.pmax/fstab.sd b/etc/etc.pmax/fstab.sd
deleted file mode 100644
index b4d3a4d3620..00000000000
--- a/etc/etc.pmax/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2001/08/26 11:55:39 simonb Exp $
-#
-/dev/sd0a / ffs rw 1 1
-#/dev/sd0d /var ffs rw 1 2
-#/dev/sd0h /usr ffs rw 1 3
diff --git a/etc/etc.prep/fstab.nfs b/etc/etc.prep/fstab.nfs
deleted file mode 100644
index e620be8d108..00000000000
--- a/etc/etc.prep/fstab.nfs
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.1 2000/02/29 15:23:47 nonaka Exp $
-#
-server:/export/prep/root / nfs rw
-procfs /proc procfs rw
-kernfs /kern kernfs rw
diff --git a/etc/etc.prep/fstab.sd b/etc/etc.prep/fstab.sd
deleted file mode 100644
index ab055ac24a0..00000000000
--- a/etc/etc.prep/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2000/08/06 16:11:33 nonaka Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0d /usr ffs rw 1 2
diff --git a/etc/etc.prep/fstab.wd b/etc/etc.prep/fstab.wd
deleted file mode 100644
index 01550055161..00000000000
--- a/etc/etc.prep/fstab.wd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2000/08/06 16:11:33 nonaka Exp $
-#
-/dev/wd0a / ffs rw 1 1
-/dev/wd0b none swap sw 0 0
-/dev/wd0d /usr ffs rw 1 2
diff --git a/etc/etc.sandpoint/fstab.nfs b/etc/etc.sandpoint/fstab.nfs
deleted file mode 100644
index 4a5d27bb45c..00000000000
--- a/etc/etc.sandpoint/fstab.nfs
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.1 2001/06/07 16:47:12 briggs Exp $
-#
-server:/export/sandpoint/root / nfs rw
-procfs /proc procfs rw
-kernfs /kern kernfs rw
diff --git a/etc/etc.sandpoint/fstab.sd b/etc/etc.sandpoint/fstab.sd
deleted file mode 100644
index 37a58b55745..00000000000
--- a/etc/etc.sandpoint/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2001/06/07 16:47:12 briggs Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0d /usr ffs rw 1 2
diff --git a/etc/etc.sandpoint/fstab.wd b/etc/etc.sandpoint/fstab.wd
deleted file mode 100644
index 8c3f51af2ce..00000000000
--- a/etc/etc.sandpoint/fstab.wd
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: fstab.wd,v 1.2 2001/11/26 16:34:57 lukem Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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.
-# the CD-ROM entry is commented out because IDE controller based
-# machines often do not have SCSI CD devices.
-#
-#/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=10m 0 0
-kernfs /kern kernfs rw 0 0
-procfs /proc procfs rw 0 0
diff --git a/etc/etc.sgimips/fstab.sd b/etc/etc.sgimips/fstab.sd
deleted file mode 100644
index e4a841e8d7c..00000000000
--- a/etc/etc.sgimips/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 2000/06/14 05:29:01 soren Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.shark/fstab.wd b/etc/etc.shark/fstab.wd
deleted file mode 100644
index 386cc2fcc7a..00000000000
--- a/etc/etc.shark/fstab.wd
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2002/02/10 19:30:42 pooka Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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/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
diff --git a/etc/etc.sparc/fstab.sd b/etc/etc.sparc/fstab.sd
deleted file mode 100644
index d0a1bc3555d..00000000000
--- a/etc/etc.sparc/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.3 1998/01/09 06:09:44 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.sparc64/fstab.sd b/etc/etc.sparc64/fstab.sd
deleted file mode 100644
index dd81b1cc112..00000000000
--- a/etc/etc.sparc64/fstab.sd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd,v 1.1 1999/01/23 21:03:23 eeh Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.sparc64/fstab.wd b/etc/etc.sparc64/fstab.wd
deleted file mode 100644
index 80d5b7e8033..00000000000
--- a/etc/etc.sparc64/fstab.wd
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.wd,v 1.1 2000/08/22 05:33:27 mrg Exp $
-#
-/dev/wd0a / ffs rw 1 1
-/dev/wd0b none swap sw 0 0
-/dev/wd0g /usr ffs rw 1 2
diff --git a/etc/etc.sun2/fstab.nfs b/etc/etc.sun2/fstab.nfs
deleted file mode 100644
index 77501f80680..00000000000
--- a/etc/etc.sun2/fstab.nfs
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.1 2001/05/18 00:13:27 fredette Exp $
-#
-server:/export/client/root / nfs rw,-r=1024,-w=1024
-server:/export/netbsd.sun2/usr /usr nfs ro,-r=1024,-w=1024
diff --git a/etc/etc.sun2/fstab.sd0 b/etc/etc.sun2/fstab.sd0
deleted file mode 100644
index caa9d2deba5..00000000000
--- a/etc/etc.sun2/fstab.sd0
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd0,v 1.1 2001/05/18 00:13:27 fredette Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.sun3/fstab.nfs b/etc/etc.sun3/fstab.nfs
deleted file mode 100644
index bae6af23f45..00000000000
--- a/etc/etc.sun3/fstab.nfs
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: fstab.nfs,v 1.4 1998/01/09 06:09:45 perry Exp $
-#
-server:/export/client/root / nfs rw,-r=1024,-w=1024
-server:/export/netbsd.sun3/usr /usr nfs ro,-r=1024,-w=1024
diff --git a/etc/etc.sun3/fstab.sd0 b/etc/etc.sun3/fstab.sd0
deleted file mode 100644
index b544a1cbb18..00000000000
--- a/etc/etc.sun3/fstab.sd0
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.sd0,v 1.3 1998/01/09 06:09:46 perry Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0b none swap sw 0 0
-/dev/sd0g /usr ffs rw 1 2
diff --git a/etc/etc.vax/fstab.ra b/etc/etc.vax/fstab.ra
deleted file mode 100644
index 7cded43d3dd..00000000000
--- a/etc/etc.vax/fstab.ra
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: fstab.ra,v 1.3 1998/01/09 06:09:48 perry Exp $
-#
-/dev/ra0a / ffs rw 1 1
-/dev/ra0g /mnt ffs rw 1 3
-/dev/ra0h /usr ffs rw 1 2
diff --git a/etc/etc.walnut/fstab.wd b/etc/etc.walnut/fstab.wd
deleted file mode 100644
index 3f08fe5caaa..00000000000
--- a/etc/etc.walnut/fstab.wd
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: fstab.wd,v 1.2 2001/11/26 16:34:58 lukem Exp $
-#
-# Sample fstab for IDE disk based system
-# see fstab(5) for details on what the fields mean
-# Notes:
-# 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 32M mfs partition; see mount_mfs(8) for details.
-# the CD-ROM entry is commented out because IDE controller based
-# machines often do not have SCSI CD devices.
-#
-/dev/wd0a / ffs rw 1 1
-#/dev/wd0b none swap sw 0 0
-swap /tmp mfs rw,-s=32m 0 0
-kernfs /kern kernfs rw 0 0
-procfs /proc procfs rw 0 0
diff --git a/etc/etc.x68k/fstab.sd0 b/etc/etc.x68k/fstab.sd0
deleted file mode 100644
index 5a6f977ab05..00000000000
--- a/etc/etc.x68k/fstab.sd0
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd0,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd0a / ffs rw 1 1
-/dev/sd0d /usr ffs rw 1 1
-#/dev/sd0f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd0e /home ffs rw 1 1
-#/dev/sd0h /usr/X11R6 ffs rw 1 1
-#/dev/sd0g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd1 b/etc/etc.x68k/fstab.sd1
deleted file mode 100644
index 5971e341a95..00000000000
--- a/etc/etc.x68k/fstab.sd1
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd1,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd1a / ffs rw 1 1
-/dev/sd1d /usr ffs rw 1 1
-#/dev/sd1f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd1e /home ffs rw 1 1
-#/dev/sd1h /usr/X11R6 ffs rw 1 1
-#/dev/sd1g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd2 b/etc/etc.x68k/fstab.sd2
deleted file mode 100644
index 2f120ba84ac..00000000000
--- a/etc/etc.x68k/fstab.sd2
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd2,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd2a / ffs rw 1 1
-/dev/sd2d /usr ffs rw 1 1
-#/dev/sd2f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd2e /home ffs rw 1 1
-#/dev/sd2h /usr/X11R6 ffs rw 1 1
-#/dev/sd2g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd3 b/etc/etc.x68k/fstab.sd3
deleted file mode 100644
index 4c56495be5c..00000000000
--- a/etc/etc.x68k/fstab.sd3
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd3,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd3a / ffs rw 1 1
-/dev/sd3d /usr ffs rw 1 1
-#/dev/sd3f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd3e /home ffs rw 1 1
-#/dev/sd3h /usr/X11R6 ffs rw 1 1
-#/dev/sd3g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd4 b/etc/etc.x68k/fstab.sd4
deleted file mode 100644
index 3391cdc6f6c..00000000000
--- a/etc/etc.x68k/fstab.sd4
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd4,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd4a / ffs rw 1 1
-/dev/sd4d /usr ffs rw 1 1
-#/dev/sd4f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd4e /home ffs rw 1 1
-#/dev/sd4h /usr/X11R6 ffs rw 1 1
-#/dev/sd4g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd5 b/etc/etc.x68k/fstab.sd5
deleted file mode 100644
index d16dd9a22b5..00000000000
--- a/etc/etc.x68k/fstab.sd5
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd5,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd5a / ffs rw 1 1
-/dev/sd5d /usr ffs rw 1 1
-#/dev/sd5f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd5e /home ffs rw 1 1
-#/dev/sd5h /usr/X11R6 ffs rw 1 1
-#/dev/sd0g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd6 b/etc/etc.x68k/fstab.sd6
deleted file mode 100644
index 0dd3ea40d12..00000000000
--- a/etc/etc.x68k/fstab.sd6
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd6,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd6a / ffs rw 1 1
-/dev/sd6d /usr ffs rw 1 1
-#/dev/sd6f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd6e /home ffs rw 1 1
-#/dev/sd6h /usr/X11R6 ffs rw 1 1
-#/dev/sd6g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/etc/etc.x68k/fstab.sd7 b/etc/etc.x68k/fstab.sd7
deleted file mode 100644
index 918ec162ad6..00000000000
--- a/etc/etc.x68k/fstab.sd7
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: fstab.sd7,v 1.3 2001/11/26 16:34:58 lukem Exp $
-#
-/dev/sd7a / ffs rw 1 1
-/dev/sd7d /usr ffs rw 1 1
-#/dev/sd7f /usr/local ffs rw 1 1
-#swap /tmp mfs rw,-s=10m 1 1
-#/dev/sd7e /home ffs rw 1 1
-#/dev/sd7h /usr/X11R6 ffs rw 1 1
-#/dev/sd7g /usr2 ffs rw 1 1
-/dev/cd0a /cdrom cd9660 ro 1 1
-#kern /kern kernfs rw 1 1
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 72d1c5f20d9..ffa2abcd3f7 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.7 2001/01/06 13:28:19 martin Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/04 19:43:59 jdolecek Exp $
-SUBDIR= amd apm emul ftpd isdn supfiles syslogd
+SUBDIR= amd apm emul fstab ftpd isdn supfiles syslogd
.include <bsd.subdir.mk>
diff --git a/share/examples/fstab/Makefile b/share/examples/fstab/Makefile
new file mode 100644
index 00000000000..2ea6c692b54
--- /dev/null
+++ b/share/examples/fstab/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2002/05/04 19:44:34 jdolecek 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
+FILESDIR=/usr/share/examples/fstab
+.endif
+
+.include <bsd.prog.mk>
diff --git a/share/examples/fstab/fstab.md b/share/examples/fstab/fstab.md
new file mode 100644
index 00000000000..c81c8f213a8
--- /dev/null
+++ b/share/examples/fstab/fstab.md
@@ -0,0 +1,3 @@
+# $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
new file mode 100644
index 00000000000..e2a9d95c00c
--- /dev/null
+++ b/share/examples/fstab/fstab.nfs.1
@@ -0,0 +1,7 @@
+# $NetBSD: fstab.nfs.1,v 1.1 2002/05/04 19:44:34 jdolecek 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
diff --git a/share/examples/fstab/fstab.nfs.2 b/share/examples/fstab/fstab.nfs.2
new file mode 100644
index 00000000000..0185874510b
--- /dev/null
+++ b/share/examples/fstab/fstab.nfs.2
@@ -0,0 +1,7 @@
+# $NetBSD: fstab.nfs.2,v 1.1 2002/05/04 19:44:34 jdolecek Exp $
+#
+# Sample fstab file for diskless clients using NFS.
+#
+server:/export/arch/root / nfs rw
+procfs /proc procfs rw
+kernfs /kern kernfs rw
diff --git a/etc/etc.next68k/fstab.nfs b/share/examples/fstab/fstab.nfs.3
index 57f626b2a7b..8019dc045fb 100644
--- a/etc/etc.next68k/fstab.nfs
+++ b/share/examples/fstab/fstab.nfs.3
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.nfs,v 1.4 2001/11/26 16:34:57 lukem Exp $
+# $NetBSD: fstab.nfs.3,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
#
# Sample fstab for NFS based system
# see fstab(5) for details on what the fields mean
@@ -8,6 +8,6 @@
# /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/next68k / 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
+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
diff --git a/share/examples/fstab/fstab.ra b/share/examples/fstab/fstab.ra
new file mode 100644
index 00000000000..60fed07377a
--- /dev/null
+++ b/share/examples/fstab/fstab.ra
@@ -0,0 +1,7 @@
+# $NetBSD: fstab.ra,v 1.1 2002/05/04 19:44:35 jdolecek 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
diff --git a/etc/etc.hp300/fstab.rd b/share/examples/fstab/fstab.rd
index 273ae3f8c09..61553849dab 100644
--- a/etc/etc.hp300/fstab.rd
+++ b/share/examples/fstab/fstab.rd
@@ -1,4 +1,6 @@
-# $NetBSD: fstab.rd,v 1.2 1998/01/09 06:09:39 perry Exp $
+# $NetBSD: fstab.rd,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
+#
+# Sample fstab file for hp300 rd(4) disks.
#
/dev/rd0a / ffs rw 1 1
/dev/rd0e /usr ffs rw 1 2
diff --git a/etc/etc.arc/fstab.sd b/share/examples/fstab/fstab.sd0.1
index b84151a90d7..231d2655266 100644
--- a/etc/etc.arc/fstab.sd
+++ b/share/examples/fstab/fstab.sd0.1
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.sd,v 1.2 2001/11/26 16:34:56 lukem Exp $
+# $NetBSD: fstab.sd0.1,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
#
# Sample fstab for SCSI disk based system
# see fstab(5) for details on what the fields mean
diff --git a/etc/etc.news68k/fstab.sd b/share/examples/fstab/fstab.sd0.2
index 6c320e77639..a165f6c04ab 100644
--- a/etc/etc.news68k/fstab.sd
+++ b/share/examples/fstab/fstab.sd0.2
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.sd,v 1.1 1999/12/09 15:10:37 tsutsui Exp $
+# $NetBSD: fstab.sd0.2,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
#
/dev/sd0a / ffs rw 1 1
/dev/sd0b none swap sw 0 0
diff --git a/etc/etc.amiga/fstab.tmp b/share/examples/fstab/fstab.sd0.amiga
index ce41aeb2ac1..3c3ec4bf347 100644
--- a/etc/etc.amiga/fstab.tmp
+++ b/share/examples/fstab/fstab.sd0.amiga
@@ -1,5 +1,6 @@
+# $NetBSD: fstab.sd0.amiga,v 1.1 2002/05/04 19:44:35 jdolecek Exp $
#
-# $NetBSD: fstab.tmp,v 1.10 2001/11/26 16:34:56 lukem Exp $
+# Sample fstab for Amiga.
#
# fast file system on / root partition (NBR\7) lowest scsi disk unit
/dev/sd0a / ffs rw 1 1
diff --git a/etc/etc.atari/fstab.tmp b/share/examples/fstab/fstab.sd0.atari
index 8490ab1ba45..f2ab523a69a 100644
--- a/etc/etc.atari/fstab.tmp
+++ b/share/examples/fstab/fstab.sd0.atari
@@ -1,5 +1,4 @@
-#
-# $NetBSD: fstab.tmp,v 1.4 2001/11/26 16:34:57 lukem Exp $
+# $NetBSD: fstab.sd0.atari,v 1.1 2002/05/04 19:44:36 jdolecek 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
diff --git a/etc/etc.hpcsh/fstab.wd b/share/examples/fstab/fstab.wd0.1
index 819a07ef9ce..4ab1f7b465b 100644
--- a/etc/etc.hpcsh/fstab.wd
+++ b/share/examples/fstab/fstab.wd0.1
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.wd,v 1.1 2001/02/28 15:46:49 uch Exp $
+# $NetBSD: fstab.wd0.1,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
/dev/wd0a / ffs rw 1 1
#/dev/wd0b none swap sw 0 0
kernfs /kern kernfs rw 0 0
diff --git a/etc/etc.acorn32/fstab.wd b/share/examples/fstab/fstab.wd0.2
index 7f89afad5b5..9b57bb00db6 100644
--- a/etc/etc.acorn32/fstab.wd
+++ b/share/examples/fstab/fstab.wd0.2
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.wd,v 1.1 2001/11/30 14:22:33 reinoud Exp $
+# $NetBSD: fstab.wd0.2,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
#
# Sample fstab for IDE disk based system
# see fstab(5) for details on what the fields mean
diff --git a/etc/etc.arc/fstab.wd b/share/examples/fstab/fstab.wd0.3
index d5f1b3ce154..961635f1c9a 100644
--- a/etc/etc.arc/fstab.wd
+++ b/share/examples/fstab/fstab.wd0.3
@@ -1,4 +1,4 @@
-# $NetBSD: fstab.wd,v 1.3 2001/11/26 16:34:56 lukem Exp $
+# $NetBSD: fstab.wd0.3,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
#
# Sample fstab for IDE disk based system
# see fstab(5) for details on what the fields mean
diff --git a/etc/etc.cobalt/fstab.wd b/share/examples/fstab/fstab.wd0.cobalt
index 19b4a7357e2..1a2351e755c 100644
--- a/etc/etc.cobalt/fstab.wd
+++ b/share/examples/fstab/fstab.wd0.cobalt
@@ -1,5 +1,4 @@
-# $NetBSD: fstab.wd,v 1.3 2000/06/19 18:32:08 soren Exp $
-
+# $NetBSD: fstab.wd0.cobalt,v 1.1 2002/05/04 19:44:36 jdolecek Exp $
/dev/wd0a / ffs rw 1 1
/dev/wd0e /stand ext2fs rw 1 2
/dev/wd0f none swap sw 0 0