summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-09-05 00:58:37 +0000
committerobrien <obrien@FreeBSD.org>1998-09-05 00:58:37 +0000
commitc1a603227646e2020f7c82f0d1b8e8d412093612 (patch)
treeac88af13545fb861c701fb0a25f51d3808484cc7 /usr.sbin
parentf5014f7cc0caa2a0b89ffad63767c50e0c7a8d49 (diff)
downloadFreeBSD-src-c1a603227646e2020f7c82f0d1b8e8d412093612.zip
FreeBSD-src-c1a603227646e2020f7c82f0d1b8e8d412093612.tar.gz
With the change to the 4.4Lite2 mount interface we don't need special
conf files.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/amd/include/aux_conf.h7
-rw-r--r--usr.sbin/amd/libamu/Makefile5
2 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/amd/include/aux_conf.h b/usr.sbin/amd/include/aux_conf.h
index 99f326f..802b7a4 100644
--- a/usr.sbin/amd/include/aux_conf.h
+++ b/usr.sbin/amd/include/aux_conf.h
@@ -14,12 +14,11 @@
* in $srcdir/aux/macros.
*/
-/* $srcdir/conf/trap/trap_freebsd3.h */
+/* $srcdir/conf/trap/trap_default.h */
#ifdef COMMENT_GET_DIRECTLY_FROM_FILE
-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)
+#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data)
#endif /* COMMENT_GET_DIRECTLY_FROM_FILE */
-#include "conf/trap/trap_freebsd3.h"
+#include "conf/trap/trap_default.h"
/* End of included MOUNT_TRAP macro definition file */
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 9a2d379..32f3e68 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -3,12 +3,11 @@
# Makefile for amd
# This file is under a "BSD" copyright (c) by David O'Brien 1998
#
-# $Id$
+# $Id: Makefile,v 1.1 1998/08/27 08:09:41 obrien Exp $
.PATH: ${.CURDIR}/../../../contrib/amd/libamu \
${.CURDIR}/../../../contrib/amd/conf/transp \
${.CURDIR}/../../../contrib/amd/conf/mtab \
- ${.CURDIR}/../../../contrib/amd/conf/mount \
${.CURDIR}/../../../contrib/amd/conf/umount
LIB= amu
@@ -17,7 +16,7 @@ SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \
util.c wire.c xutil.c
# These would be links created by the GNU-style configure
-SRCS+= transp_sockets.c mtab_bsd.c mount_freebsd3.c umount_bsd44.c
+SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c
CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu
OpenPOWER on IntegriCloud