From 1282f9e6eca8e97bf3313cd3608b984da6be303b Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Thu, 23 Aug 2012 06:37:28 +0000 Subject: get rid of mount_nnpfs --- sbin/Makefile | 4 +- sbin/mount/mount.8 | 5 +- sbin/mount_nnpfs/Makefile | 11 ----- sbin/mount_nnpfs/mount_nnpfs.8 | 86 --------------------------------- sbin/mount_nnpfs/mount_nnpfs.c | 105 ----------------------------------------- 5 files changed, 4 insertions(+), 207 deletions(-) delete mode 100644 sbin/mount_nnpfs/Makefile delete mode 100644 sbin/mount_nnpfs/mount_nnpfs.8 delete mode 100644 sbin/mount_nnpfs/mount_nnpfs.c diff --git a/sbin/Makefile b/sbin/Makefile index 7f52bad9876..1c317981596 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.96 2012/04/06 15:11:30 jsing Exp $ +# $OpenBSD: Makefile,v 1.97 2012/08/23 06:37:27 deraadt Exp $ SUBDIR= atactl badsect bioctl clri dhclient \ disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs \ @@ -6,7 +6,7 @@ SUBDIR= atactl badsect bioctl clri dhclient \ isakmpd kbd ldattach lmccontrol mknod modload modunload mount \ mount_cd9660 mount_ext2fs mount_ffs mount_msdos \ mount_nfs mount_ntfs mount_procfs mount_udf \ - mount_vnd mount_nnpfs mountd ncheck_ffs newfs newfs_ext2fs newfs_msdos \ + mount_vnd mountd ncheck_ffs newfs newfs_ext2fs newfs_msdos \ nfsd nologin pdisk pfctl pflogd ping ping6 quotacheck \ reboot restore route rtsol savecore scan_ffs \ scsi shutdown slattach swapctl sysctl ttyflags tunefs \ diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 1d7a58b36a3..b9f2efee82e 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount.8,v 1.68 2011/04/05 18:51:25 thib Exp $ +.\" $OpenBSD: mount.8,v 1.69 2012/08/23 06:37:27 deraadt Exp $ .\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)mount.8 8.7 (Berkeley) 3/27/94 .\" -.Dd $Mdocdate: April 5 2011 $ +.Dd $Mdocdate: August 23 2012 $ .Dt MOUNT 8 .Os .Sh NAME @@ -388,7 +388,6 @@ with option .Xr mount_mfs 8 , .Xr mount_msdos 8 , .Xr mount_nfs 8 , -.Xr mount_nnpfs 8 , .Xr mount_ntfs 8 , .Xr mount_procfs 8 , .Xr mount_udf 8 , diff --git a/sbin/mount_nnpfs/Makefile b/sbin/mount_nnpfs/Makefile deleted file mode 100644 index a45371ad862..00000000000 --- a/sbin/mount_nnpfs/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/03 14:45:49 jj Exp $ - -PROG= mount_nnpfs -SRCS= mount_nnpfs.c getmntopts.c -MAN= mount_nnpfs.8 - -MOUNT= ${.CURDIR}/../mount -CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT} -.PATH: ${MOUNT} - -.include diff --git a/sbin/mount_nnpfs/mount_nnpfs.8 b/sbin/mount_nnpfs/mount_nnpfs.8 deleted file mode 100644 index 874d551c7ab..00000000000 --- a/sbin/mount_nnpfs/mount_nnpfs.8 +++ /dev/null @@ -1,86 +0,0 @@ -.\" $OpenBSD: mount_nnpfs.8,v 1.1 2009/06/03 14:45:49 jj 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 -.\" (Royal Institute of Technology, Stockholm, Sweden). -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the Kungliga Tekniska -.\" Högskolan and its contributors. -.\" -.\" 4. Neither the name of the Institute nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd $Mdocdate: June 3 2009 $ -.Dt MOUNT_NNPFS 8 -.Os -.Sh NAME -.Nm mount_nnpfs -.Nd mount the nnpfs filesystem -.Sh SYNOPSIS -.Nm mount_nnpfs -.Op Fl o Ar options -.Ar special -.Ar node -.Sh DESCRIPTION -The -.Nm -command mounts one of the nnpfs character devices, -.Ar special , -on mount point -.Ar node . -The character device is used -for communication with a user-land cache manager and file provider. -.Pp -The options are as follows: -.Bl -tag -width Ds -.It Fl o Ar options -Options are specified with a -.Fl o -flag followed by a comma separated string of options. -See the -.Xr mount 8 -man page for possible options and their meanings. -.El -.Pp -The nnpfs filesystem was written primarily to make a free, AFS-compatible -filesystem (Arla). -But since the nnpfs interface is simple and generic -it could be used for other filesystems as well. -.\" -.Sh SEE ALSO -.Xr mount 2 , -.Xr afsd 8 , -.Xr mount 8 , -.Xr umount 8 -.Sh HISTORY -The -.Nm -utility first appeared in -.Ox 2.4 . diff --git a/sbin/mount_nnpfs/mount_nnpfs.c b/sbin/mount_nnpfs/mount_nnpfs.c deleted file mode 100644 index 89f2b617c87..00000000000 --- a/sbin/mount_nnpfs/mount_nnpfs.c +++ /dev/null @@ -1,105 +0,0 @@ -/* $OpenBSD: mount_nnpfs.c,v 1.1 2009/06/03 14:45:49 jj Exp $ */ -/* - * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Högskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "mntopts.h" - - -extern char *__progname; - -static const struct mntopt mopts[] = { - MOPT_STDOPTS, - MOPT_ASYNC, - MOPT_SYNC, - MOPT_UPDATE, - MOPT_RELOAD, - {NULL} -}; - -static void -usage(void) -{ - fprintf(stderr, "usage: %s [-o options] special node\n", - __progname); - exit(1); -} - -int -main(int argc, char **argv) -{ - int ch; - int mntflags = 0; - char path[MAXPATHLEN]; - - optind = optreset = 1; - while ((ch = getopt(argc, argv, "o:")) != -1) - switch (ch) { - case 'o': - getmntopts(optarg, mopts, &mntflags); - break; - case '?': - default: - usage(); - } - - argc -= optind; - argv += optind; - - if (argc != 2) - usage(); - - if (realpath(argv[1], path) == NULL) - err(1, "realpath %s", argv[1]); - - if (mount(MOUNT_NNPFS, path, mntflags, argv[0])) { - if (errno == EOPNOTSUPP) - errx(1, "Filesystem not supported by kernel"); - else - err(1, NULL); - } - - return 0; -} -- cgit v1.2.3