X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=839a3296214ac654aa5738bc33f004ba5003dc31;hp=ec57d847dd02079745bd28b054123b93a316e3dc;hb=00511ee5c97793fa8bf3f463ac07cbb4029ca149;hpb=d876c93b7646f878ef774553611d8ad9ad8f15aa diff --git a/utils/mount/mount.c b/utils/mount/mount.c index ec57d84..839a329 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -36,6 +36,7 @@ #include "nls.h" #include "mount_constants.h" #include "nfs_paths.h" +#include "nfs_mntent.h" #include "nfs_mount.h" #include "nfs4_mount.h" @@ -64,7 +65,6 @@ static struct option longopts[] = { { "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 } }; @@ -130,6 +130,16 @@ 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 } }; @@ -176,6 +186,9 @@ static void discover_nfs_mount_data_version(void) } if (nfs_mount_data_version > NFS_MOUNT_VERSION) nfs_mount_data_version = NFS_MOUNT_VERSION; + else + if (kernel_version > MAKE_VERSION(2, 6, 22)) + string++; } static void print_one(char *spec, char *node, char *type, char *opts) @@ -225,7 +238,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype, int flags, char *opts, int freq, int pass) { struct mntent ment; - FILE *mtab; + mntFILE *mtab; int result = EX_FILEIO; ment.mnt_fsname = spec; @@ -237,36 +250,38 @@ static int add_mtab(char *spec, char *mount_point, char *fstype, if (flags & MS_REMOUNT) { update_mtab(ment.mnt_dir, &ment); - return 0; + free(ment.mnt_opts); + return EX_SUCCESS; } lock_mtab(); - if ((mtab = setmntent(MOUNTED, "a+")) == NULL) { - unlock_mtab(); + mtab = nfs_setmntent(MOUNTED, "a+"); + if (mtab == NULL || mtab->mntent_fp == NULL) { nfs_error(_("Can't open mtab: %s"), strerror(errno)); goto fail_unlock; } - if (addmntent(mtab, &ment) == 1) { + if (nfs_addmntent(mtab, &ment) == 1) { nfs_error(_("Can't write mount entry to mtab: %s"), strerror(errno)); goto fail_close; } - if (fchmod(fileno(mtab), 0644) == -1) { + if (fchmod(fileno(mtab->mntent_fp), 0644) == -1) { nfs_error(_("Can't set permissions on mtab: %s"), strerror(errno)); goto fail_close; } - result = 0; + result = EX_SUCCESS; fail_close: - endmntent(mtab); + nfs_endmntent(mtab); fail_unlock: unlock_mtab(); + free(ment.mnt_opts); return result; } @@ -283,7 +298,6 @@ void mount_usage(void) 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")); } @@ -374,14 +388,10 @@ static int try_mount(char *spec, char *mount_point, int flags, { 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 (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); @@ -421,7 +431,7 @@ int main(int argc, char *argv[]) printf("%s ("PACKAGE_STRING")\n", progname); else mount_usage(); - exit(0); + exit(EX_SUCCESS); } if ((argc < 3)) { @@ -433,7 +443,7 @@ int main(int argc, char *argv[]) mount_point = argv[2]; argv[2] = argv[0]; /* so that getopt error messages are correct */ - while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hsi", + while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': @@ -444,7 +454,7 @@ int main(int argc, char *argv[]) break; case 'V': printf("%s: ("PACKAGE_STRING")\n", progname); - exit(0); + exit(EX_SUCCESS); case 'w': flags &= ~MS_RDONLY; break; @@ -463,24 +473,10 @@ int main(int argc, char *argv[]) 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); + goto out_usage; } } @@ -489,7 +485,7 @@ int main(int argc, char *argv[]) */ if (optind != argc - 2) { mount_usage(); - exit(EX_USAGE); + goto out_usage; } if (strcmp(progname, "mount.nfs4") == 0) @@ -508,7 +504,7 @@ int main(int argc, char *argv[]) strcmp(mc->m.mnt_type, fs_type) != 0) { nfs_error(_("%s: permission denied: no match for %s " "found in /etc/fstab"), progname, mount_point); - exit(EX_USAGE); + goto out_usage; } /* @@ -523,7 +519,7 @@ int main(int argc, char *argv[]) mount_point = canonicalize(mount_point); if (!mount_point) { nfs_error(_("%s: no mount point provided"), progname); - exit(EX_USAGE); + goto out_usage; } if (mount_point[0] != '/') { nfs_error(_("%s: unrecognized mount point %s"), @@ -550,15 +546,19 @@ int main(int argc, char *argv[]) mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts, mount_opts, fake, nomtab, FOREGROUND); if (mnt_err == EX_BG) { - printf(_("mount: backgrounding \"%s\"\n"), spec); + printf(_("%s: backgrounding \"%s\"\n"), + progname, spec); fflush(stdout); /* - * Parent exits immediately with success. Make - * sure not to free "mount_point" + * Parent exits immediately with success. */ - if (fork() > 0) - exit(0); + if (daemon(0, 0)) { + nfs_error(_("%s: failed to start " + "background process: %s\n"), + progname, strerror(errno)); + exit(EX_FAIL); + } mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts, mount_opts, fake, @@ -566,10 +566,15 @@ int main(int argc, char *argv[]) if (verbose && mnt_err) printf(_("%s: giving up \"%s\"\n"), progname, spec); - exit(0); } out: + free(mount_opts); + free(extra_opts); free(mount_point); exit(mnt_err); + +out_usage: + free(mount_opts); + exit(EX_USAGE); }