service: fix serialization of exec id

[elogind.git] / load-fragment.c

diff --git a/load-fragment.c b/load-fragment.c
index f79af635b8db2e751784d1c81d7f1a58f5407ce8..f7d5382a73d7406264a9f6ec3f0f4bc3266b07be 100644 (file)
--- a/load-fragment.c
+++ b/load-fragment.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <sched.h>
 #include <sys/prctl.h>
+#include <sys/mount.h>
 
 #include "unit.h"
 #include "strv.h"
@@ -97,7 +98,7 @@ static int config_parse_deps(
                 if (!k)
                         return -ENOMEM;
 
-                r = unit_add_dependency_by_name(u, d, k, NULL);
+                r = unit_add_dependency_by_name(u, d, k, NULL, true);
                 free(k);
 
                 if (r < 0)
@@ -410,7 +411,6 @@ static int config_parse_usec(
                 void *userdata) {
 
         usec_t *usec = data;
-        unsigned long long u;
         int r;
 
         assert(filename);
@@ -418,17 +418,11 @@ static int config_parse_usec(
         assert(rvalue);
         assert(data);
 
-        if ((r = safe_atollu(rvalue, &u)) < 0) {
+        if ((r = parse_usec(rvalue, usec)) < 0) {
                 log_error("[%s:%u] Failed to parse time value: %s", filename, line, rvalue);
                 return r;
         }
 
-        /* We actually assume the user configures seconds. Later on we
-         * might choose to support suffixes for time values, to
-         * configure bigger or smaller units */
-
-        *usec = u * USEC_PER_SEC;
-
         return 0;
 }
 
@@ -909,6 +903,43 @@ static int config_parse_sysv_priority(
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
 
+static int config_parse_mount_flags(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        ExecContext *c = data;
+        char *w;
+        size_t l;
+        char *state;
+        unsigned long flags = 0;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        FOREACH_WORD(w, l, rvalue, state) {
+                if (strncmp(w, "shared", l) == 0)
+                        flags |= MS_SHARED;
+                else if (strncmp(w, "slave", l) == 0)
+                        flags |= MS_SLAVE;
+                else if (strncmp(w, "private", l) == 0)
+                        flags |= MS_PRIVATE;
+                else {
+                        log_error("[%s:%u] Failed to parse mount flags: %s", filename, line, rvalue);
+                        return -EINVAL;
+                }
+        }
+
+        c->mount_flags = flags;
+        return 0;
+}
+
 #define FOLLOW_MAX 8
 
 static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
@@ -1063,7 +1094,10 @@ static void dump_items(FILE *f, const ConfigItem *items) {
                 { config_parse_kill_mode,        "KILLMODE" },
                 { config_parse_listen,           "SOCKET [...]" },
                 { config_parse_socket_bind,      "SOCKETBIND" },
-                { config_parse_bindtodevice,     "NETWORKINTERFACE" }
+                { config_parse_bindtodevice,     "NETWORKINTERFACE" },
+                { config_parse_usec,             "SECONDS" },
+                { config_parse_path_strv,        "PATH [...]" },
+                { config_parse_mount_flags,      "MOUNTFLAG [...]" }
         };
 
         assert(f);
@@ -1149,7 +1183,12 @@ static int load_from_path(Unit *u, const char *path) {
                 { "LimitNICE",              config_parse_limit,           &(context).rlimit[RLIMIT_NICE],                  section   }, \
                 { "LimitRTPRIO",            config_parse_limit,           &(context).rlimit[RLIMIT_RTPRIO],                section   }, \
                 { "LimitRTTIME",            config_parse_limit,           &(context).rlimit[RLIMIT_RTTIME],                section   }, \
-                { "ControlGroup",           config_parse_cgroup,          u,                                               section   }
+                { "ControlGroup",           config_parse_cgroup,          u,                                               section   }, \
+                { "ReadWriteDirectories",   config_parse_path_strv,       &(context).read_write_dirs,                      section   }, \
+                { "ReadOnlyDirectories",    config_parse_path_strv,       &(context).read_only_dirs,                       section   }, \
+                { "InaccessibleDirectories",config_parse_path_strv,       &(context).inaccessible_dirs,                    section   }, \
+                { "PrivateTmp",             config_parse_bool,            &(context).private_tmp,                          section   }, \
+                { "MountFlags",             config_parse_mount_flags,     &(context),                                      section   }
 
         const ConfigItem items[] = {
                 { "Names",                  config_parse_names,           u,                                               "Unit"    },