16 files changed, 57 insertions, 3 deletions
diff --git a/conf/trap/trap_aix3.h b/conf/trap/trap_aix3.h
new file mode 100644
index 000000000000..3268eff9ecf2
--- /dev/null
+++ b/conf/trap/trap_aix3.h
@@ -0,0 +1,5 @@
+/* $srcdir/conf/trap/trap_aix3.h */
+extern int mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_opts);
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_aix3(mnt->mnt_fsname, mnt->mnt_dir, flags, type, mnt_data, mnt->mnt_opts)
+/* there is no other better place for this missing external definition */
+extern int uvmount(int VirtualFileSystemID, int Flag);
diff --git a/conf/trap/trap_aux.h b/conf/trap/trap_aux.h
new file mode 100644
index 000000000000..7aa84cd5d4cc
--- /dev/null
+++ b/conf/trap/trap_aux.h
@@ -0,0 +1,2 @@
+/* $srcdir/conf/trap/trap_aux.h */
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	fsmount(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/conf/trap/trap_dgux.h b/conf/trap/trap_dgux.h
new file mode 100644
index 000000000000..e924dcbeca38
--- /dev/null
+++ b/conf/trap/trap_dgux.h
@@ -0,0 +1,2 @@
+/* $srcdir/conf/trap/trap_dgux.h */
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_dgux(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/conf/trap/trap_freebsd3.h b/conf/trap/trap_freebsd3.h
deleted file mode 100644
index 95c664254c05..000000000000
--- a/conf/trap/trap_freebsd3.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $srcdir/conf/trap/trap_freebsd3.h */
-extern int mount_freebsd3(MTYPE_TYPE type, const char *dir, int flags, voidp data);
-#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount_freebsd3(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/conf/trap/trap_hcx.h b/conf/trap/trap_hcx.h
new file mode 100644
index 000000000000..0a51462cd11f
--- /dev/null
+++ b/conf/trap/trap_hcx.h
@@ -0,0 +1,2 @@
+/* $srcdir/conf/trap/trap_hcx.h */
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	mountsyscall(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/conf/trap/trap_hpux.h b/conf/trap/trap_hpux.h
new file mode 100644
index 000000000000..ba6352afa497
--- /dev/null
+++ b/conf/trap/trap_hpux.h
@@ -0,0 +1,15 @@
+/* $srcdir/conf/trap/trap_hpux.h */
+extern int mount_hpux(MTYPE_TYPE type, const char *dir, int flags, caddr_t data);
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_hpux(type, mnt->mnt_dir, flags, mnt_data)
+
+/*
+ * HPUX 9.x does is not even consistently inconsistent with itself.
+ * It defines an integer mount type for PCFS, but not a string type as
+ * with all other mount types.
+ *
+ * XXX: remove this ugly hack when HPUX 9.0 is defunct.
+ */
+#if MOUNT_TYPE_PCFS == MOUNT_PC
+# undef MOUNT_TYPE_PCFS
+# define MOUNT_TYPE_PCFS "pcfs"
+#endif /* MOUNT_TYPE_PCFS == MOUNT_PC */
diff --git a/conf/trap/trap_irix.h b/conf/trap/trap_irix.h
new file mode 100644
index 000000000000..e2a7fb6a5e8c
--- /dev/null
+++ b/conf/trap/trap_irix.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_irix.h */
+extern int mount_irix(char *fsname, char *dir, int flags, MTYPE_TYPE type, voidp data);
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_irix(mnt->mnt_fsname, mnt->mnt_dir, flags, type, mnt_data)
diff --git a/conf/trap/trap_isc3.h b/conf/trap/trap_isc3.h
new file mode 100644
index 000000000000..8618a86ce588
--- /dev/null
+++ b/conf/trap/trap_isc3.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_isc3.h */
+extern int mount_isc3(char *fsname, char *dir, int flags, int type, void *data);
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_isc3(mnt->mnt_fsname, mnt->mnt_dir, flags, type, mnt_data)
diff --git a/conf/trap/trap_linux.h b/conf/trap/trap_linux.h
new file mode 100644
index 000000000000..accec3f1c241
--- /dev/null
+++ b/conf/trap/trap_linux.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_linux.h */
+extern int mount_linux(MTYPE_TYPE type, mntent_t *mnt, int flags, caddr_t data);
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_linux(type, mnt, flags, mnt_data)
diff --git a/conf/trap/trap_mach3.h b/conf/trap/trap_mach3.h
new file mode 100644
index 000000000000..65af3a705d58
--- /dev/null
+++ b/conf/trap/trap_mach3.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_mach3.h */
+extern int mount_mach3(char *type, char *mnt, int flags, caddr_t mnt_data);
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_mach(type, mnt, flags, mnt_data)
diff --git a/conf/trap/trap_netbsd.h b/conf/trap/trap_netbsd.h
new file mode 100644
index 000000000000..8dd2846d446f
--- /dev/null
+++ b/conf/trap/trap_netbsd.h
@@ -0,0 +1,6 @@
+/* $srcdir/conf/trap/trap_netbsd.h */
+#if __NetBSD_Version__ >= 499002300
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data, 0)
+#else
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data)
+#endif
diff --git a/conf/trap/trap_news4.h b/conf/trap/trap_news4.h
new file mode 100644
index 000000000000..76cd429f5f31
--- /dev/null
+++ b/conf/trap/trap_news4.h
@@ -0,0 +1,2 @@
+/* $srcdir/conf/trap/trap_news4.h */
+#define MOUNT_TRAP(type, mnt, flags, mnt_data)         mount(type, mnt->mnt_dir, M_NEWTYPE | flags, mnt_data)
diff --git a/conf/trap/trap_rtu6.h b/conf/trap/trap_rtu6.h
new file mode 100644
index 000000000000..1f9c6e51975e
--- /dev/null
+++ b/conf/trap/trap_rtu6.h
@@ -0,0 +1,2 @@
+/* $srcdir/conf/trap/trap_rtu6.h */
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	vmount(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/conf/trap/trap_stellix.h b/conf/trap/trap_stellix.h
new file mode 100644
index 000000000000..5a0848e36731
--- /dev/null
+++ b/conf/trap/trap_stellix.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_stellix.h */
+extern int mount_stellix(char *fsname, char *dir, int flags, int type, void *data);
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_stellix(mnt->mnt_fsname, mnt->mnt_dir, flags, type, mnt_data)
diff --git a/conf/trap/trap_svr4.h b/conf/trap/trap_svr4.h
new file mode 100644
index 000000000000..ed8817a867d8
--- /dev/null
+++ b/conf/trap/trap_svr4.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_svr4.h */
+extern int mount_svr4(char *fsname, char *dir, int flags, MTYPE_TYPE type, caddr_t data, const char *optstr);
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount_svr4(mnt->mnt_fsname, mnt->mnt_dir, flags, type, mnt_data, mnt->mnt_opts)
diff --git a/conf/trap/trap_ultrix.h b/conf/trap/trap_ultrix.h
new file mode 100644
index 000000000000..d5cbbdbd6e95
--- /dev/null
+++ b/conf/trap/trap_ultrix.h
@@ -0,0 +1,3 @@
+/* $srcdir/conf/trap/trap_ultrix.h */
+/* arg 3 to mount(2) is rwflag */
+#define	MOUNT_TRAP(type, mnt, flags, mnt_data) 	mount(mnt->mnt_fsname, mnt->mnt_dir, flags & MNT2_GEN_OPT_RONLY, type, mnt_data)