automount: add DirectoryMode= setting

diff --git a/src/automount.c b/src/automount.c
index 5e669c5d323a4b657e741176790f77d402b37bec..b8d7ad25f4d9a938bf1bb9c21df19497d2cb6c2e 100644 (file)
--- a/src/automount.c
+++ b/src/automount.c
@@ -53,6 +53,8 @@ static void automount_init(Unit *u) {
 
         a->pipe_watch.fd = a->pipe_fd = -1;
         a->pipe_watch.type = WATCH_INVALID;
+
+        a->directory_mode = 0755;
 }
 
 static void repeat_unmout(const char *path) {
@@ -253,9 +255,11 @@ static void automount_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sAutomount State: %s\n"
-                "%sWhere: %s\n",
+                "%sWhere: %s\n"
+                "%sDirectoryMode: %04o\n",
                 prefix, automount_state_to_string(a->state),
-                prefix, a->where);
+                prefix, a->where,
+                prefix, a->directory_mode);
 }
 
 static void automount_enter_dead(Automount *a, bool success) {
@@ -536,9 +540,10 @@ static void automount_enter_runnning(Automount *a) {
         assert(a);
         assert(a->mount);
 
-        /* Before we do anything, let's see if somebody is playing games with us? */
+        mkdir_p(a->where, a->directory_mode);
 
-        if (stat(a->where, &st) < 0) {
+        /* Before we do anything, let's see if somebody is playing games with us? */
+        if (lstat(a->where, &st) < 0) {
                 log_warning("%s failed stat automount point: %m", a->meta.id);
                 goto fail;
         }

diff --git a/src/automount.h b/src/automount.h
index 44e6100ff691c8ec2a8313f70f2608b5447c5c9f..13b56effb6fa96204ea503fc830885e7337e5774 100644 (file)
--- a/src/automount.h
+++ b/src/automount.h
@@ -48,6 +48,8 @@ struct Automount {
         Watch pipe_watch;
         dev_t dev_id;
 
+        mode_t directory_mode;
+
         Set *tokens;
 
         bool failure:1;

diff --git a/src/load-fragment.c b/src/load-fragment.c
index 43a4027c32839560ea9850d70c4c141a928f9c49..49b577fb2f51d1b894864ca9ba829c2b66dd87df 100644 (file)
--- a/src/load-fragment.c
+++ b/src/load-fragment.c
@@ -1566,6 +1566,7 @@ static int load_from_path(Unit *u, const char *path) {
                 EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"),
 
                 { "Where",                  config_parse_path,            &u->automount.where,                             "Automount" },
+                { "DirectoryMode",          config_parse_mode,            &u->automount.directory_mode,                    "Automount" },
 
                 { "What",                   config_parse_path,            &u->swap.parameters_fragment.what,               "Swap"    },
                 { "Priority",               config_parse_int,             &u->swap.parameters_fragment.priority,           "Swap"    },