from netbsd: add UNION/UMAPFS <hubert.feyrer@rz.uni-regensburg.de>

diff --git a/sys/arch/amiga/conf/COFFEE b/sys/arch/amiga/conf/COFFEE
index 3497a6b..572918d 100644 (file)
--- a/sys/arch/amiga/conf/COFFEE
+++ b/sys/arch/amiga/conf/COFFEE
@@ -56,6 +56,8 @@ options               NULLFS          # Loopback filesystem
 options                FIFO            # FIFO operations on vnodes (Recommended)
 options                ADOSFS          # AmigaDOS file system
 options                "CD9660"        # ISO 9660 file system, with Rock Ridge
+options                UNION           # union file system
+options                UMAPFS          # uid/gid remapping filesystem
 #options       PORTAL          # Portal filesystem
 #options       MSDOSFS         # MS-DOS filesystem
 

diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 5171dfb..df60d86 100644 (file)
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $Id: GENERIC,v 1.3 1996/01/14 12:21:35 niklas Exp $
+#      $Id: GENERIC,v 1.4 1996/01/31 22:42:36 niklas Exp $
 
 #
 # GENERIC AMIGA
@@ -56,6 +56,8 @@ options               NULLFS          # Loopback filesystem
 options                FIFO            # FIFO operations on vnodes (Recommended)
 options                ADOSFS          # AmigaDOS file system
 options                "CD9660"        # ISO 9660 file system, with Rock Ridge
+options                UNION           # union file system
+options                UMAPFS          # uid/gid remapping filesystem
 #options       PORTAL          # Portal filesystem
 #options       MSDOSFS         # MS-DOS filesystem