X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=dde4562b045d9f60e4e571ea8a35cf1e914a7ac7;hp=2b211b9ee38eac8045da5530ed3dc41053735365;hb=8d85f209d0343cf8fef35ea0c94ba9c93af6ffa6;hpb=c7cec7fbd3fc9f46a17519d95b8211cf78e328c0 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 2b211b9..dde4562 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -171,6 +171,18 @@ static void discover_nfs_mount_data_version(void) nfs_mount_data_version = NFS_MOUNT_VERSION; } +static void print_one(char *spec, char *node, char *type, char *opts) +{ + if (verbose) { + printf("%s on %s type %s", spec, node, type); + + if (opts != NULL) + printf(" (%s)", opts); + + printf("\n"); + } +} + /* Try to build a canonical options string. */ static char * fix_opts_string (int flags, const char *extra_opts) { const struct opt_map *om; @@ -468,13 +480,16 @@ int main(int argc, char *argv[]) exit(EX_FAIL); if (strcmp(fs_type, "nfs4") == 0) - mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, 0, fake); + mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake); else - mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, 0, fake); + mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake); if (mnt_err) exit(EX_FAIL); + if (!fake) + print_one(spec, mount_point, fs_type, mount_opts); + if (!nomtab) mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts, 0, 0 /* these are always zero for NFS */ );