give up the try to start afsd from mount_afs, the argument passing was too ugly

3 files changed, 5 insertions, 28 deletions

diff --git a/sbin/mount_xfs/Makefile b/sbin/mount_xfs/Makefile
index 17dd2eb1c1f..7259422b16f 100644
--- a/sbin/mount_xfs/Makefile
+++ b/sbin/mount_xfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 1998/09/05 20:00:05 art Exp $
+#	$OpenBSD: Makefile,v 1.3 1998/10/28 18:08:50 art Exp $
 
 PROG=	mount_xfs
 SRCS=	mount_xfs.c getmntopts.c
 MAN=	mount_xfs.8
-LINKS=	${BINDIR}/mount_xfs ${BINDIR}/mount_afs
-MLINKS=	mount_xfs.8 mount_afs.8
+LINKS=	${BINDIR}/mount_xfs
+MLINKS=	mount_xfs.8
 
 MOUNT=	${.CURDIR}/../mount
 CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
diff --git a/sbin/mount_xfs/mount_xfs.8 b/sbin/mount_xfs/mount_xfs.8
index 2c9c69c2a69..773e0fb8c26 100644
--- a/sbin/mount_xfs/mount_xfs.8
+++ b/sbin/mount_xfs/mount_xfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_xfs.8,v 1.4 1998/09/28 18:24:01 ian Exp $
+.\"	$OpenBSD: mount_xfs.8,v 1.5 1998/10/28 18:08:50 art Exp $
 .\"	$NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
@@ -48,21 +48,11 @@
 .Op Fl o Ar options
 .Ar char-device
 .Ar mount-point
-.Nm mount_afs
-.Op Fl o Ar options
-.Ar char-device
-.Ar mount-point
 .Sh DESCRIPTION
 The
 .Nm mount_xfs
 command mounts one of the xfs character devices. The character device is used
 for comunication with a user-land cachemanager and fileprovider.
-The
-.Nm mount_afs
-name is a synonym to the mount_xfs command with the exception
-that it starts
-.Nm afsd
-the AFS cache-manager.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -85,6 +75,4 @@ it could be used for other filesystems as well.
 .Sh HISTORY
 The
 .Nm mount_xfs
-and
-.Nm mount_afs
 utility first appeared in OpenBSD 2.4.
diff --git a/sbin/mount_xfs/mount_xfs.c b/sbin/mount_xfs/mount_xfs.c
index 0ca7eee5475..12c42425b4d 100644
--- a/sbin/mount_xfs/mount_xfs.c
+++ b/sbin/mount_xfs/mount_xfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_xfs.c,v 1.2 1998/09/05 20:00:05 art Exp $	*/
+/*	$OpenBSD: mount_xfs.c,v 1.3 1998/10/28 18:08:50 art Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -74,10 +74,6 @@ main(int argc, char **argv)
 	int error;
 	int ch;
 	int mntflags = 0;
-	int afsd = 0;
-
-	if (strstr(__progname, "mount_afs"))
-		afsd = 1;
 
 	optind = optreset = 1;
 	while ((ch = getopt(argc, argv, "o:")) != -1)
@@ -101,12 +97,5 @@ main(int argc, char **argv)
 	if (error != 0)
 		err(1, "mount");
 
-#ifdef not_yet
-	if (afsd) {
-		execl(_PATH_AFSD, "afsd", NULL);
-		err(1, "Error starting afsd:");
-	}
-#endif
-
 	return 0;
 }