d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove UFS-specific parts from mount(8).

Browse Source 
For mounting UFS, all mount options are passed directly to nmount(),
without any UFS-specific logic.
This commit is contained in:
rodrigc 2005-11-23 23:22:56 +00:00
parent 6e9653b075
commit 4808c023d9
3 changed files with 1 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/mount/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= mount
SRCS= mount.c mount_fs.c mount_ufs.c getmntopts.c vfslist.c
SRCS= mount.c mount_fs.c getmntopts.c vfslist.c
WARNS?= 6
MAN= mount.8
# We do NOT install the getmntopts.3 man page.

2
sbin/mount/extern.h
View File

@ -30,6 +30,4 @@
int checkvfsname(const char *, const char **);
const char **makevfslist(char *);
/* mount_ufs.c */
int mount_ufs(int, char *[]);
int mount_fs(const char *, int, char *[]);

133
sbin/mount/mount_ufs.c
View File

@ -1,133 +0,0 @@
/*-
* Copyright (c) 1993, 1994
* The Regents of the University of California. 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.
* 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
*/
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/param.h>
#include <sys/mount.h>
#include <err.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ufs/ufs/ufsmount.h>
#include "extern.h"
#include "mntopts.h"
static void ufs_usage(void);
static struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_ASYNC,
MOPT_FORCE,
MOPT_SYNC,
MOPT_UPDATE,
MOPT_SNAPSHOT,
MOPT_END
};
int
mount_ufs(int argc, char *argv[])
{
struct ufs_args args;
int ch, mntflags;
char *fs_name;
mntflags = 0;
optind = optreset = 1; /* Reset for parse of new argv. */
while ((ch = getopt(argc, argv, "o:")) != -1)
switch (ch) {
case 'o':
getmntopts(optarg, mopts, &mntflags, 0);
break;
case '?':
default:
ufs_usage();
}
argc -= optind;
argv += optind;
if (argc != 2)
ufs_usage();
args.fspec = argv[0]; /* The name of the device file. */
fs_name = argv[1]; /* The mount point. */
#define DEFAULT_ROOTUID -2
args.export.ex_root = DEFAULT_ROOTUID;
if (mntflags & MNT_RDONLY)
args.export.ex_flags = MNT_EXRDONLY;
else
args.export.ex_flags = 0;
if (mount("ufs", fs_name, mntflags, &args) < 0) {
switch (errno) {
case EMFILE:
warnx("%s on %s: mount table full",
args.fspec, fs_name);
break;
case EINVAL:
if (mntflags & MNT_UPDATE)
warnx(
"%s on %s: specified device does not match mounted device",
args.fspec, fs_name);
else
warnx("%s on %s: incorrect super block",
args.fspec, fs_name);
break;
default:
warn("%s", args.fspec);
break;
}
return (1);
}
return (0);
}
static void
ufs_usage()
{
(void)fprintf(stderr, "usage: mount_ufs [-o options] special node\n");
exit(1);
}