Added the sys/stat.h header file to a number of

[nfs-utils.git] / utils / mount / mount.c

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index a668cd97c673f0aff792aaec3e5e99e415eec8d7..82b9169a10462dad5f1efbdb55596878f17db10f 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -24,6 +24,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -37,6 +38,7 @@
 #include "xcommon.h"
 #include "nls.h"
 #include "mount_constants.h"
+#include "mount_config.h"
 #include "nfs_paths.h"
 #include "nfs_mntent.h"
 
@@ -474,6 +476,8 @@ int main(int argc, char *argv[])
        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",
                                longopts, NULL)) != -1) {
@@ -559,6 +563,10 @@ int main(int argc, char *argv[])
                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);
 
@@ -586,6 +594,9 @@ int main(int argc, char *argv[])
        if (mnt_err == EX_BG) {
                printf(_("%s: backgrounding \"%s\"\n"),
                        progname, spec);
+               printf(_("%s: mount options: \"%s\"\n"),
+                       progname, extra_opts);
+
                fflush(stdout);
 
                /*