X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=62115bbdbfe579828e92e211670e6f477cd96380;hp=2dc0aec7ec84249460115c0997c9ab82f3d2db11;hb=30ebf04700654deddbf5f57d95e84ec69cea8610;hpb=28e4224b9bbfc355c83e17df74c47221afacd560 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 2dc0aec..62115bb 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -18,9 +18,13 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include +#include #include #include #include @@ -34,18 +38,26 @@ #include "xcommon.h" #include "nls.h" #include "mount_constants.h" +#include "mount_config.h" #include "nfs_paths.h" +#include "nfs_mntent.h" #include "nfs_mount.h" #include "nfs4_mount.h" -#include "nfsumount.h" #include "mount.h" #include "error.h" +#include "stropts.h" +#include "utils.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' }, @@ -61,19 +73,16 @@ static struct option longopts[] = { { 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 */ }; -/* Custom mount options for our own purposes. */ -#define MS_DUMMY 0x00000000 -#define MS_USERS 0x40000000 -#define MS_USER 0x80000000 - static const struct opt_map opt_map[] = { { "defaults", 0, 0, 0 }, /* default options */ { "ro", 1, 0, MS_RDONLY }, /* read-only */ @@ -125,11 +134,26 @@ static const struct opt_map opt_map[] = { { "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */ { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */ #endif +#ifdef MS_RELATIME + { "relatime", 0, 0, MS_RELATIME }, /* Update access times relative to + mtime/ctime */ + { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard + to mtime/ctime */ +#endif + { "noquota", 0, 0, MS_DUMMY }, /* Don't enforce quota */ + { "quota", 0, 0, MS_DUMMY }, /* Enforce user quota */ + { "usrquota", 0, 0, MS_DUMMY }, /* Enforce user quota */ + { "grpquota", 0, 0, MS_DUMMY }, /* Enforce group quota */ { NULL, 0, 0, 0 } }; -/* Try to build a canonical options string. */ -static char * fix_opts_string (int flags, const char *extra_opts) { +static void parse_opts(const char *options, int *flags, 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; @@ -142,7 +166,7 @@ static char * fix_opts_string (int flags, const char *extra_opts) { } if (flags & MS_USERS) new_opts = xstrconcat3(new_opts, ",users", ""); - + for (om = opt_map; om->opt != NULL; om++) { if (om->skip) continue; @@ -157,79 +181,111 @@ static char * fix_opts_string (int flags, const char *extra_opts) { return new_opts; } -static int add_mtab(char *spec, char *mount_point, char *fstype, - int flags, char *opts, int freq, int pass) +static void +init_mntent(struct mntent *mnt, char *fsname, char *dir, char *type, + int flags, char *opts) { - struct mntent ment; - FILE *mtab; - int result = EX_FILEIO; - - ment.mnt_fsname = spec; - ment.mnt_dir = mount_point; - ment.mnt_type = fstype; - ment.mnt_opts = fix_opts_string(flags, opts); - ment.mnt_freq = freq; - ment.mnt_passno = pass; - - if (flags & MS_REMOUNT) { - update_mtab(ment.mnt_dir, &ment); - return 0; - } + mnt->mnt_fsname = fsname; + mnt->mnt_dir = dir; + mnt->mnt_type = type; + mnt->mnt_opts = fix_opts_string(flags & ~MS_NOMTAB, opts); + + /* these are always zero for NFS */ + mnt->mnt_freq = 0; + mnt->mnt_passno = 0; +} - lock_mtab(); +/* Create mtab with a root entry. */ +static void +create_mtab (void) { + struct mntentchn *fstab; + struct mntent mnt; + int flags; + mntFILE *mfp; - if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { - unlock_mtab(); - nfs_error(_("Can't open mtab: %s"), - strerror(errno)); - goto fail_unlock; - } + lock_mtab(); - if (addmntent(mtab, &ment) == 1) { - nfs_error(_("Can't write mount entry to mtab: %s"), - strerror(errno)); - goto fail_close; + mfp = nfs_setmntent (MOUNTED, "a+"); + if (mfp == NULL || mfp->mntent_fp == NULL) { + int errsv = errno; + die (EX_FILEIO, _("mount: can't open %s for writing: %s"), + MOUNTED, strerror (errsv)); } - if (fchmod(fileno(mtab), 0644) == -1) { - nfs_error(_("Can't set permissions on mtab: %s"), - strerror(errno)); - goto fail_close; + /* Find the root entry by looking it up in fstab */ + if ((fstab = getfsfile ("/")) || (fstab = getfsfile ("root"))) { + char *extra_opts; + parse_opts (fstab->m.mnt_opts, &flags, &extra_opts); + init_mntent(&mnt, xstrdup(fstab->m.mnt_fsname), "/", + fstab->m.mnt_type, flags, extra_opts); + free(extra_opts); + + if (nfs_addmntent (mfp, &mnt) == 1) { + int errsv = errno; + die (EX_FILEIO, _("mount: error writing %s: %s"), + _PATH_MOUNTED, strerror (errsv)); + } } + if (fchmod (fileno (mfp->mntent_fp), 0644) < 0) + if (errno != EROFS) { + int errsv = errno; + die (EX_FILEIO, + _("mount: error changing mode of %s: %s"), + _PATH_MOUNTED, strerror (errsv)); + } + nfs_endmntent (mfp); - result = 0; - -fail_close: - endmntent(mtab); -fail_unlock: unlock_mtab(); - return result; + reset_mtab_info(); } -int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) +static int add_mtab(char *spec, char *mount_point, char *fstype, + int flags, char *opts) { - return mount(spec, node, type, flags, data); -} + struct mntent ment; + int result = EX_SUCCESS; -void mount_usage() -{ - printf("usage: %s remotetarget dir [-rvVwfnh] [-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"); + init_mntent(&ment, spec, mount_point, fstype, flags, opts); + + if (!nomtab && mtab_does_not_exist()) { + if (verbose > 1) + printf(_("mount: no %s found - creating it..\n"), + MOUNTED); + create_mtab (); + } + + if (!nomtab && mtab_is_writable()) { + if (flags & MS_REMOUNT) + update_mtab(ment.mnt_dir, &ment); + else { + mntFILE *mtab; + + lock_mtab(); + mtab = nfs_setmntent(MOUNTED, "a+"); + if (mtab == NULL || mtab->mntent_fp == NULL) { + nfs_error(_("Can't open mtab: %s"), + strerror(errno)); + result = EX_FILEIO; + } else { + if (nfs_addmntent(mtab, &ment) == 1) { + nfs_error(_("Can't write mount entry to mtab: %s"), + strerror(errno)); + result = EX_FILEIO; + } + } + nfs_endmntent(mtab); + unlock_mtab(); + } + } + + free(ment.mnt_opts); + + return result; } -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, size_t len) +{ const struct opt_map *om; for (om = opt_map; om->opt != NULL; om++) { @@ -251,30 +307,35 @@ parse_opt(const char *opt, int *mask, char *extra_opts, int len) { 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 */ + size_t 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; } @@ -283,108 +344,61 @@ static void parse_opts (const char *options, int *flags, char **extra_opts) } } -static int chk_mountpoint(char *mount_point) +static int try_mount(char *spec, char *mount_point, int flags, + char *fs_type, char **extra_opts, char *mount_opts, + int fake, int bg) { - struct stat sb; + int ret; - if (stat(mount_point, &sb) < 0){ - mount_error(NULL, mount_point, errno); - return 1; - } - if (S_ISDIR(sb.st_mode) == 0){ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } - if (access(mount_point, X_OK) < 0) { - mount_error(NULL, mount_point, errno); - return 1; + if (string) + ret = nfsmount_string(spec, mount_point, fs_type, 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); } - return 0; -} - -extern u_short getport( - struct sockaddr_in *saddr, - u_long prog, - u_long vers, - u_int prot); + if (ret) + return ret; -static int probe_statd() -{ - struct sockaddr_in addr; - u_short port; + if (!fake) + print_one(spec, mount_point, fs_type, mount_opts); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - port = getport(&addr, 100024, 1, IPPROTO_UDP); - - if (port == 0) - return 0; - addr.sin_port = htons(port); - - if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0) - return 0; - - return 1; -} - -static int start_statd() -{ - /* If /var/run/rpc.statd.pid exists and is non-empty, - * assume statd already running. - * If START_STATD not defined, or defined to a non-existent file, - * don't bother, - * else run that file (typically a shell script) - */ - struct stat stb; - - if (probe_statd()) - return 1; -#ifdef START_STATD - if (stat(START_STATD, &stb) ==0 && - S_ISREG(stb.st_mode) && - (stb.st_mode & S_IXUSR)) { - system(START_STATD); - if (probe_statd()) - return 1; - } -#endif - return 0; + return add_mtab(spec, mount_point, fs_type, flags, *extra_opts); } int main(int argc, char *argv[]) { int c, flags = 0, mnt_err = 1, fake = 0; - char *spec, *mount_point, *fs_type = "nfs"; + char *spec = NULL, *mount_point = NULL, *fs_type = "nfs"; char *extra_opts = NULL, *mount_opts = NULL; uid_t uid = getuid(); progname = basename(argv[0]); - if(!strncmp(progname, "umount", strlen("umount"))) { - if(argc < 2) { - umount_usage(); - exit(1); - } + nfs_mount_data_version = discover_nfs_mount_data_version(&string); + + if(!strncmp(progname, "umount", strlen("umount"))) exit(nfsumount(argc, argv)); - } - if(argv[1] && argv[1][0] == '-') { + if (argv[1] && argv[1][0] == '-') { if(argv[1][1] == 'V') printf("%s ("PACKAGE_STRING")\n", progname); else mount_usage(); - return 0; + exit(EX_SUCCESS); } if ((argc < 3)) { mount_usage(); - exit(1); + exit(EX_USAGE); } - spec = argv[1]; - mount_point = argv[2]; + mount_config_init(progname); argv[2] = argv[0]; /* so that getopt error messages are correct */ while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", @@ -398,7 +412,7 @@ int main(int argc, char *argv[]) break; case 'V': printf("%s: ("PACKAGE_STRING")\n", progname); - return 0; + exit(EX_SUCCESS); case 'w': flags &= ~MS_RDONLY; break; @@ -420,13 +434,24 @@ int main(int argc, char *argv[]) case 'h': default: mount_usage(); - exit(1); + goto out_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(1); + goto out_usage; + } else { + while (optind < argc) { + if (!spec) + spec = argv[optind]; + else + mount_point = argv[optind]; + optind++; + } } if (strcmp(progname, "mount.nfs4") == 0) @@ -443,9 +468,9 @@ int main(int argc, char *argv[]) if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || strcmp(mc->m.mnt_type, fs_type) != 0) { - fprintf(stderr, "%s: permission denied: no match for %s " - "found in /etc/fstab\n", progname, mount_point); - exit(1); + nfs_error(_("%s: permission denied: no match for %s " + "found in /etc/fstab"), progname, mount_point); + goto out_usage; } /* @@ -458,63 +483,77 @@ int main(int argc, char *argv[]) } mount_point = canonicalize(mount_point); - if (mount_point == NULL || - mount_point[0] != '/') { - fprintf(stderr, "%s: unknown mount point %s\n", - progname, mount_point ? : ""); - exit(1); + if (!mount_point) { + nfs_error(_("%s: no mount point provided"), progname); + goto out_usage; + } + if (mount_point[0] != '/') { + nfs_error(_("%s: unrecognized mount point %s"), + progname, mount_point); + mnt_err = EX_USAGE; + goto out; } - + /* + * Concatenate mount options from the configuration file + */ + mount_opts = mount_config_opts(spec, mount_point, mount_opts); + parse_opts(mount_opts, &flags, &extra_opts); if (uid != 0) { - if (! (flags & (MS_USERS | MS_USER))) { - fprintf(stderr, "%s: permission denied\n", progname); - exit(1); - } - } - - if (chk_mountpoint(mount_point)) - exit(EX_FAIL); + if (!(flags & (MS_USERS|MS_USER))) { + nfs_error(_("%s: permission denied"), progname); + mnt_err = EX_USAGE; + goto out; + } - if (strcmp(fs_type, "nfs4") == 0) - mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); - else { - int need_statd = 0; - mnt_err = nfsmount(spec, mount_point, &flags, - &extra_opts, &mount_opts, - 0, &need_statd); - if (!mnt_err && !fake && need_statd) { - if (!start_statd()) { - fprintf(stderr, - "%s: rpc.statd is not running but is " - "required for remote locking\n" - " Either use \"-o nolocks\" to keep " - "locks local, or start statd.\n", - progname); - exit(1); - } + if (geteuid() != 0) { + nfs_error(_("%s: not installed setuid - " + "\"user\" NFS mounts not supported."), progname); + exit(EX_FAIL); } } - if (mnt_err) - exit(EX_FAIL); + if (chk_mountpoint(mount_point)) { + mnt_err = EX_USAGE; + goto out; + } - if (!fake) { - mnt_err = do_mount_syscall(spec, mount_point, fs_type, - flags & ~(MS_USER|MS_USERS) , - mount_opts); + mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts, + mount_opts, fake, FOREGROUND); + if (mnt_err == EX_BG) { + printf(_("%s: backgrounding \"%s\"\n"), + progname, spec); + printf(_("%s: mount options: \"%s\"\n"), + progname, extra_opts); - if (mnt_err) { - mount_error(spec, mount_point, errno); + fflush(stdout); + + /* + * 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, + BACKGROUND); + if (verbose && mnt_err) + printf(_("%s: giving up \"%s\"\n"), + progname, spec); + } +out: + free(mount_opts); + free(extra_opts); + free(mount_point); exit(mnt_err); -} +out_usage: + free(mount_opts); + exit(EX_USAGE); +}