make a link to mount_afs that will automagically start afsd

3 files changed, 24 insertions, 19 deletions

diff --git a/sbin/mount_xfs/Makefile b/sbin/mount_xfs/Makefile
index bc5eee745ce..17dd2eb1c1f 100644
--- a/sbin/mount_xfs/Makefile
+++ b/sbin/mount_xfs/Makefile
@@ -1,8 +1,10 @@
-#	$OpenBSD: Makefile,v 1.1 1998/09/05 17:33:30 art Exp $
+#	$OpenBSD: Makefile,v 1.2 1998/09/05 20:00:05 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
 
 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 00be4003229..d2349efc587 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.1 1998/09/05 17:33:29 art Exp $
+.\"	$OpenBSD: mount_xfs.8,v 1.2 1998/09/05 20:00:05 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
@@ -45,7 +45,10 @@
 .Nd mount the xfs filesystem.
 .Sh SYNOPSIS
 .Nm mount_xfs
-.Op Fl a
+.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
@@ -54,13 +57,15 @@ 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
-.It Fl a
-Do not start
-.Xr afsd
-when mounting
 .It Fl o
 Options are specified with a
 .Fl o
@@ -76,8 +81,10 @@ it could be used for other filesystems asweel.
 .\"
 .Sh SEE ALSO
 .Xr mount 8
-.Xr arlad 8
+.Xr afsd 8
 .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 8491a820276..0ca7eee5475 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.1 1998/09/05 17:33:29 art Exp $	*/
+/*	$OpenBSD: mount_xfs.c,v 1.2 1998/09/05 20:00:05 art Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -62,7 +62,7 @@ static const struct mntopt mopts[] = {
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s [-a] [-o options] device path\n",
+	fprintf(stderr, "Usage: %s [-o options] device path\n",
 		__progname);
 	exit(1);
 }
@@ -74,21 +74,17 @@ main(int argc, char **argv)
 	int error;
 	int ch;
 	int mntflags = 0;
-#ifdef not_yet
-	int afsd = 1;
-#endif
+	int afsd = 0;
+
+	if (strstr(__progname, "mount_afs"))
+		afsd = 1;
 
 	optind = optreset = 1;
-	while ((ch = getopt(argc, argv, "ao:")) != -1)
+	while ((ch = getopt(argc, argv, "o:")) != -1)
 		switch (ch) {
 		case 'o':
 			getmntopts(optarg, mopts, &mntflags);
 			break;
-#ifdef not_yey
-		case 'a':
-			afsd = 0;
-			break;
-#endif
 		case '?':
 		default:
 			usage();