#include "nfs_mount.h"
#include "nfs4_mount.h"
-#include "nfsumount.h"
#include "mount.h"
#include "error.h"
#include "network.h"
+#include "stropts.h"
char *progname;
int nfs_mount_data_version;
int nomtab;
int verbose;
int sloppy;
+int string;
+
+#define FOREGROUND (0)
+#define BACKGROUND (1)
static struct option longopts[] = {
{ "fake", 0, 0, 'f' },
{ "version", 0, 0, 'V' },
{ "read-write", 0, 0, 'w' },
{ "rw", 0, 0, 'w' },
+ { "string", 0, 0, 'i' },
{ "options", 1, 0, 'o' },
{ NULL, 0, 0, 0 }
};
-/* Map from -o and fstab option strings to the flag argument to mount(2). */
+/*
+ * Map from -o and fstab option strings to the flag argument to mount(2).
+ */
struct opt_map {
- const char *opt; /* option name */
- int skip; /* skip in mtab option string */
- int inv; /* true if flag value should be inverted */
- int mask; /* flag mask value */
+ const char *opt; /* option name */
+ int skip; /* skip in mtab option string */
+ int inv; /* true if flag value should be inverted */
+ int mask; /* flag mask value */
};
static const struct opt_map opt_map[] = {
static void print_one(char *spec, char *node, char *type, char *opts)
{
- if (verbose) {
- printf("%s on %s type %s", spec, node, type);
+ if (!verbose)
+ return;
- if (opts != NULL)
- printf(" (%s)", opts);
-
- printf("\n");
- }
+ if (opts)
+ printf(_("%s on %s type %s (%s)\n"), spec, node, type, opts);
+ else
+ printf(_("%s on %s type %s\n"), spec, node, type);
}
-/* Try to build a canonical options string. */
-static char * fix_opts_string (int flags, const char *extra_opts) {
+/*
+ * Build a canonical mount option string for /etc/mtab.
+ */
+static char *fix_opts_string(int flags, const char *extra_opts)
+{
const struct opt_map *om;
char *new_opts;
if (flags & MS_REMOUNT) {
update_mtab(ment.mnt_dir, &ment);
- return 0;
+ free(ment.mnt_opts);
+ return EX_SUCCESS;
}
lock_mtab();
goto fail_close;
}
- result = 0;
+ result = EX_SUCCESS;
fail_close:
endmntent(mtab);
fail_unlock:
unlock_mtab();
+ free(ment.mnt_opts);
return result;
}
-void mount_usage()
+void mount_usage(void)
{
- printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n",
+ printf(_("usage: %s remotetarget dir [-rvVwfnsih] [-o nfsoptions]\n"),
progname);
- printf("options:\n");
- printf("\t-r\t\tMount file system readonly\n");
- printf("\t-v\t\tVerbose\n");
- printf("\t-V\t\tPrint version\n");
- printf("\t-w\t\tMount file system read-write\n");
- printf("\t-f\t\tFake mount, do not actually mount\n");
- printf("\t-n\t\tDo not update /etc/mtab\n");
- printf("\t-s\t\tTolerate sloppy mount options rather than failing.\n");
- printf("\t-h\t\tPrint this help\n");
- printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n");
+ printf(_("options:\n"));
+ printf(_("\t-r\t\tMount file system readonly\n"));
+ printf(_("\t-v\t\tVerbose\n"));
+ printf(_("\t-V\t\tPrint version\n"));
+ printf(_("\t-w\t\tMount file system read-write\n"));
+ printf(_("\t-f\t\tFake mount, do not actually mount\n"));
+ printf(_("\t-n\t\tDo not update /etc/mtab\n"));
+ printf(_("\t-s\t\tTolerate sloppy mount options rather than fail\n"));
+ printf(_("\t-i\t\tPass mount options to the kernel via a string\n"));
+ printf(_("\t-h\t\tPrint this help\n"));
+ printf(_("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"));
}
-static inline void
-parse_opt(const char *opt, int *mask, char *extra_opts, int len) {
+static void parse_opt(const char *opt, int *mask, char *extra_opts, int len)
+{
const struct opt_map *om;
for (om = opt_map; om->opt != NULL; om++) {
strcat(extra_opts, opt);
}
-/* Take -o options list and compute 4th and 5th args to mount(2). flags
- gets the standard options (indicated by bits) and extra_opts all the rest */
-static void parse_opts (const char *options, int *flags, char **extra_opts)
+/*
+ * Convert the provided mount command-line options into the 4th &
+ * 5th arguments to mount(2). Output parameter "@flags" gets the
+ * standard options (indicated by MS_ bits), and output parameter
+ * "@extra_opts" gets all the filesystem-specific options.
+ */
+static void parse_opts(const char *options, int *flags, char **extra_opts)
{
if (options != NULL) {
char *opts = xstrdup(options);
char *opt, *p;
- int len = strlen(opts) + 1; /* include room for a null */
+ int len = strlen(opts) + 1; /* include room for a null */
int open_quote = 0;
*extra_opts = xmalloc(len);
**extra_opts = '\0';
- for (p=opts, opt=NULL; p && *p; p++) {
+ for (p = opts, opt = NULL; p && *p; p++) {
if (!opt)
- opt = p; /* begin of the option item */
+ opt = p; /* begin of the option item */
if (*p == '"')
- open_quote ^= 1; /* reverse the status */
+ open_quote ^= 1; /* reverse the status */
if (open_quote)
- continue; /* still in a quoted block */
+ continue; /* still in a quoted block */
if (*p == ',')
- *p = '\0'; /* terminate the option item */
+ *p = '\0'; /* terminate the option item */
+
/* end of option item or last item */
- if (*p == '\0' || *(p+1) == '\0') {
+ if (*p == '\0' || *(p + 1) == '\0') {
parse_opt(opt, flags, *extra_opts, len);
opt = NULL;
}
return 0;
}
+static int try_mount(char *spec, char *mount_point, int flags,
+ char *fs_type, char **extra_opts, char *mount_opts,
+ int fake, int nomtab, int bg)
+{
+ int ret;
+
+ if (string) {
+ if (strcmp(fs_type, "nfs4") == 0)
+ ret = nfs4mount_s(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ else
+ ret = nfsmount_s(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ } else {
+ if (strcmp(fs_type, "nfs4") == 0)
+ ret = nfs4mount(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ else
+ ret = nfsmount(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ }
+
+ if (ret)
+ return ret;
+
+ if (!fake)
+ print_one(spec, mount_point, fs_type, mount_opts);
+
+ if (!nomtab)
+ ret = add_mtab(spec, mount_point, fs_type, flags, *extra_opts,
+ 0, 0 /* these are always zero for NFS */ );
+ return ret;
+}
+
int main(int argc, char *argv[])
{
int c, flags = 0, mnt_err = 1, fake = 0;
discover_nfs_mount_data_version();
- if(!strncmp(progname, "umount", strlen("umount"))) {
- if(argc < 2) {
- umount_usage();
- exit(EX_USAGE);
- }
+ if(!strncmp(progname, "umount", strlen("umount")))
exit(nfsumount(argc, argv));
- }
if (argv[1] && argv[1][0] == '-') {
if(argv[1][1] == 'V')
printf("%s ("PACKAGE_STRING")\n", progname);
else
mount_usage();
- exit(0);
+ exit(EX_SUCCESS);
}
if ((argc < 3)) {
mount_point = argv[2];
argv[2] = argv[0]; /* so that getopt error messages are correct */
- while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs",
+ while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hsi",
longopts, NULL)) != -1) {
switch (c) {
case 'r':
break;
case 'V':
printf("%s: ("PACKAGE_STRING")\n", progname);
- return 0;
+ exit(EX_SUCCESS);
case 'w':
flags &= ~MS_RDONLY;
break;
case 's':
++sloppy;
break;
+ case 'i':
+ if (linux_version_code() < MAKE_VERSION(2, 6, 23)) {
+ nfs_error(_("%s: Passing mount options via a"
+ " string is unsupported by this"
+ " kernel\n"), progname);
+ exit(EX_USAGE);
+ }
+ if (uid != 0) {
+ nfs_error(_("%s: -i option is restricted to 'root'\n"),
+ progname);
+ exit(EX_USAGE);
+ }
+ ++string;
+ break;
case 'h':
default:
mount_usage();
exit(EX_USAGE);
}
}
- if (optind != argc-2) {
- /* Extra non-option words at the end... */
+
+ /*
+ * Extra non-option words at the end are bogus...
+ */
+ if (optind != argc - 2) {
mount_usage();
exit(EX_USAGE);
}
goto out;
}
- if (strcmp(fs_type, "nfs4") == 0)
- mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
- else
- mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
-
- if (mnt_err)
- exit(EX_FAIL);
+ mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
+ mount_opts, fake, nomtab, FOREGROUND);
+ if (mnt_err == EX_BG) {
+ printf(_("%s: backgrounding \"%s\"\n"),
+ progname, spec);
+ fflush(stdout);
- if (!fake)
- print_one(spec, mount_point, fs_type, mount_opts);
+ /*
+ * Parent exits immediately with success.
+ */
+ if (daemon(0, 0)) {
+ nfs_error(_("%s: failed to start "
+ "background process: %s\n"),
+ progname, strerror(errno));
+ exit(EX_FAIL);
+ }
- if (!nomtab)
- mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts,
- 0, 0 /* these are always zero for NFS */ );
+ mnt_err = try_mount(spec, mount_point, flags, fs_type,
+ &extra_opts, mount_opts, fake,
+ nomtab, BACKGROUND);
+ if (verbose && mnt_err)
+ printf(_("%s: giving up \"%s\"\n"),
+ progname, spec);
+ }
out:
+ free(extra_opts);
free(mount_point);
exit(mnt_err);
}
-
projects / nfs-utils.git / blobdiff