chiark / gitweb /
implement recursive_stop/stop_when_unneeded unit flags
[elogind.git] / load-fragment.c
index 5570ae591378142837b32a3218697de93214fd1f..ac96d0f746836e8b25daca5457d4a1f4233834d5 100644 (file)
@@ -1,15 +1,18 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+#include <linux/oom.h>
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <linux/oom.h>
+#include <unistd.h>
+#include <fcntl.h>
 
-#include "name.h"
+#include "unit.h"
 #include "strv.h"
 #include "conf-parser.h"
 #include "load-fragment.h"
 #include "log.h"
+#include "ioprio.h"
 
 static int config_parse_deps(
                 const char *filename,
@@ -20,8 +23,8 @@ static int config_parse_deps(
                 void *data,
                 void *userdata) {
 
-        Set **set = data;
-        Name *name = userdata;
+        UnitDependency d = PTR_TO_UINT(data);
+        Unit *u = userdata;
         char *w;
         size_t l;
         char *state;
@@ -29,27 +32,19 @@ static int config_parse_deps(
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(data);
 
         FOREACH_WORD(w, &l, rvalue, state) {
                 char *t;
                 int r;
-                Name *other;
 
                 if (!(t = strndup(w, l)))
                         return -ENOMEM;
 
-                r = manager_load_name(name->meta.manager, t, &other);
+                r = unit_add_dependency_by_name(u, d, t);
                 free(t);
 
                 if (r < 0)
                         return r;
-
-                if ((r = set_ensure_allocated(set, trivial_hash_func, trivial_compare_func)) < 0)
-                        return r;
-
-                if ((r = set_put(*set, other)) < 0)
-                        return r;
         }
 
         return 0;
@@ -64,8 +59,7 @@ static int config_parse_names(
                 void *data,
                 void *userdata) {
 
-        Set **set = data;
-        Name *name = userdata;
+        Unit *u = userdata;
         char *w;
         size_t l;
         char *state;
@@ -78,42 +72,33 @@ static int config_parse_names(
         FOREACH_WORD(w, &l, rvalue, state) {
                 char *t;
                 int r;
-                Name *other;
+                Unit *other;
 
                 if (!(t = strndup(w, l)))
                         return -ENOMEM;
 
-                other = manager_get_name(name->meta.manager, t);
+                other = manager_get_unit(u->meta.manager, t);
 
                 if (other) {
 
-                        if (other != name) {
+                        if (other != u) {
 
-                                if (other->meta.load_state != NAME_STUB) {
+                                if (other->meta.load_state != UNIT_STUB) {
                                         free(t);
                                         return -EEXIST;
                                 }
 
-                                if ((r = name_merge(name, other)) < 0) {
+                                if ((r = unit_merge(u, other)) < 0) {
                                         free(t);
                                         return r;
                                 }
                         }
 
                 } else {
-
-                        if (!*set)
-                                if (!(*set = set_new(trivial_hash_func, trivial_compare_func))) {
-                                        free(t);
-                                        return -ENOMEM;
-                                }
-
-                        if ((r = set_put(*set, t)) < 0) {
+                        if ((r = unit_add_name(u, t)) < 0) {
                                 free(t);
                                 return r;
                         }
-
-                        t = NULL;
                 }
 
                 free(t);
@@ -220,7 +205,8 @@ static int config_parse_nice(
                 void *data,
                 void *userdata) {
 
-        int *i = data, priority, r;
+        ExecContext *c = data;
+        int priority, r;
 
         assert(filename);
         assert(lvalue);
@@ -237,7 +223,9 @@ static int config_parse_nice(
                 return -ERANGE;
         }
 
-        *i = priority;
+        c->nice = priority;
+        c->nice_set = false;
+
         return 0;
 }
 
@@ -250,7 +238,8 @@ static int config_parse_oom_adjust(
                 void *data,
                 void *userdata) {
 
-        int *i = data, oa, r;
+        ExecContext *c = data;
+        int oa, r;
 
         assert(filename);
         assert(lvalue);
@@ -267,7 +256,9 @@ static int config_parse_oom_adjust(
                 return -ERANGE;
         }
 
-        *i = oa;
+        c->oom_adjust = oa;
+        c->oom_adjust_set = true;
+
         return 0;
 }
 
@@ -333,13 +324,14 @@ static int config_parse_exec(
         if (!(n = new(char*, k+1)))
                 return -ENOMEM;
 
+        k = 0;
         FOREACH_WORD_QUOTED(w, l, rvalue, state)
                 if (!(n[k++] = strndup(w, l)))
                         goto fail;
 
         n[k] = NULL;
 
-        if (!n[0] || n[0][0] != '/') {
+        if (!n[0] || !path_is_absolute(n[0])) {
                 log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue);
                 strv_free(n);
                 return -EINVAL;
@@ -461,97 +453,510 @@ static int config_parse_service_restart(
         return 0;
 }
 
-int name_load_fragment(Name *n) {
-
-        static const char* const section_table[_NAME_TYPE_MAX] = {
-                [NAME_SERVICE]   = "Service",
-                [NAME_TIMER]     = "Timer",
-                [NAME_SOCKET]    = "Socket",
-                [NAME_MILESTONE] = "Milestone",
-                [NAME_DEVICE]    = "Device",
-                [NAME_MOUNT]     = "Mount",
-                [NAME_AUTOMOUNT] = "Automount",
-                [NAME_SNAPSHOT]  = "Snapshot"
+int config_parse_bindtodevice(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        Socket *s = data;
+        char *n;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (rvalue[0] && !streq(rvalue, "*")) {
+                if (!(n = strdup(rvalue)))
+                        return -ENOMEM;
+        } else
+                n = NULL;
+
+        free(s->bind_to_device);
+        s->bind_to_device = n;
+
+        return 0;
+}
+
+int config_parse_output(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        ExecOutput *o = data;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (streq(rvalue, "syslog"))
+                *o = EXEC_SYSLOG;
+        else if (streq(rvalue, "null"))
+                *o = EXEC_NULL;
+        else if (streq(rvalue, "syslog"))
+                *o = EXEC_SYSLOG;
+        else if (streq(rvalue, "kernel"))
+                *o = EXEC_KERNEL;
+        else {
+                log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue);
+                return -EBADMSG;
+        }
+
+        return 0;
+}
+
+int config_parse_facility(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        static const char * const table[LOG_NFACILITIES] = {
+                [LOG_FAC(LOG_KERN)] = "kern",
+                [LOG_FAC(LOG_USER)] = "user",
+                [LOG_FAC(LOG_MAIL)] = "mail",
+                [LOG_FAC(LOG_DAEMON)] = "daemon",
+                [LOG_FAC(LOG_AUTH)] = "auth",
+                [LOG_FAC(LOG_SYSLOG)] = "syslog",
+                [LOG_FAC(LOG_LPR)] = "lpr",
+                [LOG_FAC(LOG_NEWS)] = "news",
+                [LOG_FAC(LOG_UUCP)] = "uucp",
+                [LOG_FAC(LOG_CRON)] = "cron",
+                [LOG_FAC(LOG_AUTHPRIV)] = "authpriv",
+                [LOG_FAC(LOG_FTP)] = "ftp",
+                [LOG_FAC(LOG_LOCAL0)] = "local0",
+                [LOG_FAC(LOG_LOCAL1)] = "local1",
+                [LOG_FAC(LOG_LOCAL2)] = "local2",
+                [LOG_FAC(LOG_LOCAL3)] = "local3",
+                [LOG_FAC(LOG_LOCAL4)] = "local4",
+                [LOG_FAC(LOG_LOCAL5)] = "local5",
+                [LOG_FAC(LOG_LOCAL6)] = "local6",
+                [LOG_FAC(LOG_LOCAL7)] = "local7"
+        };
+
+        ExecOutput *o = data;
+        int i;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        for (i = 0; i < (int) ELEMENTSOF(table); i++)
+                if (streq(rvalue, table[i])) {
+                        *o = LOG_MAKEPRI(i, LOG_PRI(*o));
+                        break;
+                }
+
+        if (i >= (int) ELEMENTSOF(table)) {
+
+                /* Second try, let's see if this is a number. */
+                if (safe_atoi(rvalue, &i) >= 0 &&
+                    i >= 0 &&
+                    i < (int) ELEMENTSOF(table))
+                        *o = LOG_MAKEPRI(i, LOG_PRI(*o));
+                else {
+                        log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue);
+                        return -EBADMSG;
+                }
+        }
+
+        return 0;
+}
+
+int config_parse_level(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        static const char * const table[LOG_DEBUG+1] = {
+                [LOG_EMERG] = "emerg",
+                [LOG_ALERT] = "alert",
+                [LOG_CRIT] = "crit",
+                [LOG_ERR] = "err",
+                [LOG_WARNING] = "warning",
+                [LOG_NOTICE] = "notice",
+                [LOG_INFO] = "info",
+                [LOG_DEBUG] = "debug"
+        };
+
+        ExecOutput *o = data;
+        int i;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        for (i = 0; i < (int) ELEMENTSOF(table); i++)
+                if (streq(rvalue, table[i])) {
+                        *o = LOG_MAKEPRI(LOG_FAC(*o), i);
+                        break;
+                }
+
+        if (i >= LOG_NFACILITIES) {
+
+                /* Second try, let's see if this is a number. */
+                if (safe_atoi(rvalue, &i) >= 0 &&
+                    i >= 0 &&
+                    i < (int) ELEMENTSOF(table))
+                        *o = LOG_MAKEPRI(LOG_FAC(*o), i);
+                else {
+                        log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue);
+                        return -EBADMSG;
+                }
+        }
+
+        return 0;
+}
+
+int config_parse_io_class(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        static const char * const table[] = {
+                [IOPRIO_CLASS_NONE] = NULL,
+                [IOPRIO_CLASS_RT] = "realtime",
+                [IOPRIO_CLASS_BE] = "best-effort",
+                [IOPRIO_CLASS_IDLE] = "idle",
+        };
+
+        ExecContext *c = data;
+        int i;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        for (i = 0; i < (int) ELEMENTSOF(table); i++) {
+                if (!table[i])
+                        continue;
+
+                if (streq(rvalue, table[i])) {
+                        c->ioprio = IOPRIO_PRIO_VALUE(i, IOPRIO_PRIO_DATA(c->ioprio));
+                        break;
+                }
+        }
+
+        if (i >= (int) ELEMENTSOF(table)) {
+
+                /* Second try, let's see if this is a number. */
+                if (safe_atoi(rvalue, &i) >= 0 &&
+                    i >= 0 &&
+                    i < (int) ELEMENTSOF(table) &&
+                    table[i])
+                        c->ioprio = IOPRIO_PRIO_VALUE(i, IOPRIO_PRIO_DATA(c->ioprio));
+                else {
+                        log_error("[%s:%u] Failed to parse io priority: %s", filename, line, rvalue);
+                        return -EBADMSG;
+                }
+        }
+
+        c->ioprio_set = true;
+
+        return 0;
+}
+
+int config_parse_io_priority(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        ExecContext *c = data;
+        int i;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (safe_atoi(rvalue, &i) >= 0 &&
+            i >= 0 &&
+            i < IOPRIO_BE_NR)
+                c->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_PRIO_CLASS(c->ioprio), i);
+        else {
+                log_error("[%s:%u] Failed to parse io priority: %s", filename, line, rvalue);
+                return -EBADMSG;
+        }
+
+        c->ioprio_set = true;
+
+        return 0;
+}
+
+#define FOLLOW_MAX 8
+
+static int open_follow(char **filename, FILE **_f, Set *names, char **_id) {
+        unsigned c = 0;
+        int fd, r;
+        FILE *f;
+        char *id = NULL;
+
+        assert(filename);
+        assert(*filename);
+        assert(_f);
+        assert(names);
+
+        /* This will update the filename pointer if the loaded file is
+         * reached by a symlink. The old string will be freed. */
+
+        for (;;) {
+                char *target, *k, *name;
+
+                if (c++ >= FOLLOW_MAX)
+                        return -ELOOP;
+
+                path_kill_slashes(*filename);
+
+                /* Add the file name we are currently looking at to
+                 * the names of this unit */
+                name = file_name_from_path(*filename);
+                if (!(id = set_get(names, name))) {
+
+                        if (!(id = strdup(name)))
+                                return -ENOMEM;
+
+                        if ((r = set_put(names, id)) < 0) {
+                                free(id);
+                                return r;
+                        }
+                }
+
+                /* Try to open the file name, but don't if its a symlink */
+                if ((fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) >= 0)
+                        break;
+
+                if (errno != ELOOP)
+                        return -errno;
+
+                /* Hmm, so this is a symlink. Let's read the name, and follow it manually */
+                if ((r = readlink_malloc(*filename, &target)) < 0)
+                        return r;
+
+                k = file_in_same_dir(*filename, target);
+                free(target);
+
+                if (!k)
+                        return -ENOMEM;
+
+                free(*filename);
+                *filename = k;
+        }
+
+        if (!(f = fdopen(fd, "r"))) {
+                r = -errno;
+                assert(close_nointr(fd) == 0);
+                return r;
+        }
+
+        *_f = f;
+        *_id = id;
+        return 0;
+}
+
+static int load_from_path(Unit *u, const char *path) {
+
+        static const char* const section_table[_UNIT_TYPE_MAX] = {
+                [UNIT_SERVICE]   = "Service",
+                [UNIT_TIMER]     = "Timer",
+                [UNIT_SOCKET]    = "Socket",
+                [UNIT_TARGET]    = "Target",
+                [UNIT_DEVICE]    = "Device",
+                [UNIT_MOUNT]     = "Mount",
+                [UNIT_AUTOMOUNT] = "Automount",
+                [UNIT_SNAPSHOT]  = "Snapshot"
         };
 
 #define EXEC_CONTEXT_CONFIG_ITEMS(context, section) \
-                { "Directory",              config_parse_path,            &(context).directory,                              section   }, \
-                { "User",                   config_parse_string,          &(context).user,                                   section   }, \
-                { "Group",                  config_parse_string,          &(context).group,                                  section   }, \
-                { "SupplementaryGroups",    config_parse_strv,            &(context).supplementary_groups,                   section   }, \
-                { "Nice",                   config_parse_nice,            &(context).nice,                                   section   }, \
-                { "OOMAdjust",              config_parse_oom_adjust,      &(context).oom_adjust,                             section   }, \
-                { "UMask",                  config_parse_umask,           &(context).umask,                                  section   }, \
-                { "Environment",            config_parse_strv,            &(context).environment,                            section   }
+                { "WorkingDirectory",       config_parse_path,            &(context).working_directory,                    section   }, \
+                { "RootDirectory",          config_parse_path,            &(context).root_directory,                       section   }, \
+                { "User",                   config_parse_string,          &(context).user,                                 section   }, \
+                { "Group",                  config_parse_string,          &(context).group,                                section   }, \
+                { "SupplementaryGroups",    config_parse_strv,            &(context).supplementary_groups,                 section   }, \
+                { "Nice",                   config_parse_nice,            &(context),                                      section   }, \
+                { "OOMAdjust",              config_parse_oom_adjust,      &(context),                                      section   }, \
+                { "IOPriority",             config_parse_io_priority,     &(context),                                      section   }, \
+                { "IOSchedulingClass",      config_parse_io_class,        &(context),                                      section   }, \
+                { "UMask",                  config_parse_umask,           &(context).umask,                                section   }, \
+                { "Environment",            config_parse_strv,            &(context).environment,                          section   }, \
+                { "Output",                 config_parse_output,          &(context).output,                               section   }, \
+                { "SyslogIdentifier",       config_parse_string,          &(context).syslog_identifier,                    section   }, \
+                { "SyslogFacility",         config_parse_facility,        &(context).syslog_priority,                      section   }, \
+                { "SyslogLevel",            config_parse_level,           &(context).syslog_priority,                      section   }
 
         const ConfigItem items[] = {
-                { "Names",                  config_parse_names,           &n->meta.names,                                    "Meta"    },
-                { "Description",            config_parse_string,          &n->meta.description,                              "Meta"    },
-                { "Requires",               config_parse_deps,            n->meta.dependencies+NAME_REQUIRES,                "Meta"    },
-                { "SoftRequires",           config_parse_deps,            n->meta.dependencies+NAME_SOFT_REQUIRES,           "Meta"    },
-                { "Wants",                  config_parse_deps,            n->meta.dependencies+NAME_WANTS,                   "Meta"    },
-                { "Requisite",              config_parse_deps,            n->meta.dependencies+NAME_REQUISITE,               "Meta"    },
-                { "SoftRequisite",          config_parse_deps,            n->meta.dependencies+NAME_SOFT_REQUISITE,          "Meta"    },
-                { "Conflicts",              config_parse_deps,            n->meta.dependencies+NAME_CONFLICTS,               "Meta"    },
-                { "Before",                 config_parse_deps,            n->meta.dependencies+NAME_BEFORE,                  "Meta"    },
-                { "After",                  config_parse_deps,            n->meta.dependencies+NAME_AFTER,                   "Meta"    },
-
-                { "PIDFile",                config_parse_path,            &n->service.pid_file,                              "Service" },
-                { "ExecStartPre",           config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_START_PRE],  "Service" },
-                { "ExecStart",              config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_START],      "Service" },
-                { "ExecStartPost",          config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_START_POST], "Service" },
-                { "ExecReload",             config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_RELOAD],     "Service" },
-                { "ExecStop",               config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_STOP],       "Service" },
-                { "ExecStopPost",           config_parse_exec,            &n->service.exec_command[SERVICE_EXEC_STOP_POST],  "Service" },
-                { "RestartSec",             config_parse_usec,            &n->service.restart_usec,                          "Service" },
-                { "TimeoutSec",             config_parse_usec,            &n->service.timeout_usec,                          "Service" },
-                { "Type",                   config_parse_service_type,    &n->service,                                       "Service" },
-                { "Restart",                config_parse_service_restart, &n->service,                                       "Service" },
-                EXEC_CONTEXT_CONFIG_ITEMS(n->service.exec_context, "Service"),
-
-                { "ListenStream",           config_parse_listen,          &n->socket,                                        "Socket"  },
-                { "ListenDatagram",         config_parse_listen,          &n->socket,                                        "Socket"  },
-                { "ListenSequentialPacket", config_parse_listen,          &n->socket,                                        "Socket"  },
-                { "ListenFIFO",             config_parse_listen,          &n->socket,                                        "Socket"  },
-                { "BindIPv6Only",           config_parse_socket_bind,     &n->socket,                                        "Socket"  },
-                { "Backlog",                config_parse_unsigned,        &n->socket.backlog,                                "Socket"  },
-                { "ExecStartPre",           config_parse_exec,            &n->service.exec_command[SOCKET_EXEC_START_PRE],   "Socket"  },
-                { "ExecStartPost",          config_parse_exec,            &n->service.exec_command[SOCKET_EXEC_START_POST],  "Socket"  },
-                { "ExecStopPre",            config_parse_exec,            &n->service.exec_command[SOCKET_EXEC_STOP_PRE],    "Socket"  },
-                { "ExecStopPost",           config_parse_exec,            &n->service.exec_command[SOCKET_EXEC_STOP_POST],   "Socket"  },
-                EXEC_CONTEXT_CONFIG_ITEMS(n->socket.exec_context, "Socket"),
-
-                EXEC_CONTEXT_CONFIG_ITEMS(n->automount.exec_context, "Automount"),
+                { "Names",                  config_parse_names,           u,                                               "Meta"    },
+                { "Description",            config_parse_string,          &u->meta.description,                            "Meta"    },
+                { "Requires",               config_parse_deps,            UINT_TO_PTR(UNIT_REQUIRES),                      "Meta"    },
+                { "SoftRequires",           config_parse_deps,            UINT_TO_PTR(UNIT_SOFT_REQUIRES),                 "Meta"    },
+                { "Wants",                  config_parse_deps,            UINT_TO_PTR(UNIT_WANTS),                         "Meta"    },
+                { "Requisite",              config_parse_deps,            UINT_TO_PTR(UNIT_REQUISITE),                     "Meta"    },
+                { "SoftRequisite",          config_parse_deps,            UINT_TO_PTR(UNIT_SOFT_REQUISITE),                "Meta"    },
+                { "Conflicts",              config_parse_deps,            UINT_TO_PTR(UNIT_CONFLICTS),                     "Meta"    },
+                { "Before",                 config_parse_deps,            UINT_TO_PTR(UNIT_BEFORE),                        "Meta"    },
+                { "After",                  config_parse_deps,            UINT_TO_PTR(UNIT_AFTER),                         "Meta"    },
+                { "RecursiveStop",          config_parse_bool,            &u->meta.recursive_stop,                         "Meta"    },
+                { "StopWhenUnneeded",       config_parse_bool,            &u->meta.stop_when_unneeded,                     "Meta"    },
+
+                { "PIDFile",                config_parse_path,            &u->service.pid_file,                            "Service" },
+                { "ExecStartPre",           config_parse_exec,            u->service.exec_command+SERVICE_EXEC_START_PRE,  "Service" },
+                { "ExecStart",              config_parse_exec,            u->service.exec_command+SERVICE_EXEC_START,      "Service" },
+                { "ExecStartPost",          config_parse_exec,            u->service.exec_command+SERVICE_EXEC_START_POST, "Service" },
+                { "ExecReload",             config_parse_exec,            u->service.exec_command+SERVICE_EXEC_RELOAD,     "Service" },
+                { "ExecStop",               config_parse_exec,            u->service.exec_command+SERVICE_EXEC_STOP,       "Service" },
+                { "ExecStopPost",           config_parse_exec,            u->service.exec_command+SERVICE_EXEC_STOP_POST,  "Service" },
+                { "RestartSec",             config_parse_usec,            &u->service.restart_usec,                        "Service" },
+                { "TimeoutSec",             config_parse_usec,            &u->service.timeout_usec,                        "Service" },
+                { "Type",                   config_parse_service_type,    &u->service,                                     "Service" },
+                { "Restart",                config_parse_service_restart, &u->service,                                     "Service" },
+                EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"),
+
+                { "ListenStream",           config_parse_listen,          &u->socket,                                      "Socket"  },
+                { "ListenDatagram",         config_parse_listen,          &u->socket,                                      "Socket"  },
+                { "ListenSequentialPacket", config_parse_listen,          &u->socket,                                      "Socket"  },
+                { "ListenFIFO",             config_parse_listen,          &u->socket,                                      "Socket"  },
+                { "BindIPv6Only",           config_parse_socket_bind,     &u->socket,                                      "Socket"  },
+                { "Backlog",                config_parse_unsigned,        &u->socket.backlog,                              "Socket"  },
+                { "BindToDevice",           config_parse_bindtodevice,    &u->socket,                                      "Socket"  },
+                { "ExecStartPre",           config_parse_exec,            u->socket.exec_command+SOCKET_EXEC_START_PRE,    "Socket"  },
+                { "ExecStartPost",          config_parse_exec,            u->socket.exec_command+SOCKET_EXEC_START_POST,   "Socket"  },
+                { "ExecStopPre",            config_parse_exec,            u->socket.exec_command+SOCKET_EXEC_STOP_PRE,     "Socket"  },
+                { "ExecStopPost",           config_parse_exec,            u->socket.exec_command+SOCKET_EXEC_STOP_POST,    "Socket"  },
+                EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"),
+
+                EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"),
 
                 { NULL, NULL, NULL, NULL }
         };
 
 #undef EXEC_CONTEXT_CONFIG_ITEMS
 
-        char *t;
-        int r;
         const char *sections[3];
-        Iterator i;
-
-        assert(n);
-        assert(n->meta.load_state == NAME_STUB);
+        char *k;
+        int r;
+        Set *symlink_names;
+        FILE *f;
+        char *filename, *id;
 
         sections[0] = "Meta";
-        sections[1] = section_table[n->meta.type];
+        sections[1] = section_table[u->meta.type];
         sections[2] = NULL;
 
-        SET_FOREACH(t, n->meta.names, i) {
+        if (!(symlink_names = set_new(string_hash_func, string_compare_func)))
+                return -ENOMEM;
+
+        /* Instead of opening the path right away, we manually
+         * follow all symlinks and add their name to our unit
+         * name set while doing so */
+        if (!(filename = path_make_absolute(path, unit_path()))) {
+                r = -ENOMEM;
+                goto finish;
+        }
+
+        if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+                if (r == -ENOENT)
+                        r = 0; /* returning 0 means: no suitable config file found */
+
+                goto finish;
+        }
+
+        /* Now, parse the file contents */
+        r = config_parse(filename, f, sections, items, u);
+        if (r < 0)
+                goto finish;
+
+        /* Let's try to add in all symlink names we found */
+        while ((k = set_steal_first(symlink_names))) {
+                if ((r = unit_add_name(u, k)) < 0)
+                        goto finish;
+
+
+                if (id == k)
+                        unit_choose_id(u, id);
+                free(k);
+        }
+
+
+        free(u->meta.load_path);
+        u->meta.load_path = filename;
+        filename = NULL;
+
+        r = 1; /* returning 1 means: suitable config file found and loaded */
+
+finish:
+        while ((k = set_steal_first(symlink_names)))
+                free(k);
+        set_free(symlink_names);
+        free(filename);
+
+        return r;
+}
+
+int unit_load_fragment(Unit *u) {
+        int r = 0;
+        ExecContext *c;
+
+        assert(u);
+        assert(u->meta.load_state == UNIT_STUB);
+
+        if (u->meta.load_path)
+                r = load_from_path(u, u->meta.load_path);
+        else {
+                Iterator i;
+                char *t;
 
                 /* Try to find a name we can load this with */
-                if ((r = config_parse(t, sections, items, n)) == -ENOENT)
-                        continue;
+                SET_FOREACH(t, u->meta.names, i)
+                        if ((r = load_from_path(u, t)) != 0)
+                                return r;
+        }
 
-                /* Yay, we succeeded! Now let's call this our identifier */
-                if (r == 0)
-                        n->meta.id = t;
+        if (u->meta.type == UNIT_SOCKET)
+                c = &u->socket.exec_context;
+        else if (u->meta.type == UNIT_SERVICE)
+                c = &u->service.exec_context;
+        else
+                c = NULL;
 
-                return r;
+        if (r >= 0 && c &&
+            (c->output == EXEC_KERNEL || c->output == EXEC_SYSLOG)) {
+                int k;
+
+                /* If syslog or kernel logging is requested, make sure
+                 * our own logging daemon is run first. */
+
+                if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0)
+                        return k;
+
+                if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0)
+                        return k;
         }
 
-        return -ENOENT;
+        return r;
 }