-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#include <sys/prctl.h>
#include <sys/mount.h>
#include <linux/fs.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include "unit.h"
#include "strv.h"
#include "securebits.h"
#include "missing.h"
#include "unit-name.h"
+#include "bus-errors.h"
-#define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \
- static int function( \
- const char *filename, \
- unsigned line, \
- const char *section, \
- const char *lvalue, \
- const char *rvalue, \
- void *data, \
- void *userdata) { \
- \
- type *i = data, x; \
- \
- assert(filename); \
- assert(lvalue); \
- assert(rvalue); \
- assert(data); \
- \
- if ((x = name##_from_string(rvalue)) < 0) { \
- log_error("[%s:%u] " msg ": %s", filename, line, rvalue); \
- return -EBADMSG; \
- } \
- \
- *i = x; \
- \
- return 0; \
- }
+#ifndef HAVE_SYSV_COMPAT
+static int config_parse_warn_compat(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ log_debug("[%s:%u] Support for option %s= has been disabled at compile time and is ignored", filename, line, lvalue);
+ return 0;
+}
+#endif
static int config_parse_deps(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *t, *k;
int r;
return -ENOMEM;
r = unit_add_dependency_by_name(u, d, k, NULL, true);
- free(k);
- if (r < 0)
- return r;
+ if (r < 0) {
+ log_error("Failed to add dependency on %s, ignoring: %s", k, strerror(-r));
+ free(k);
+ return 0;
+ }
+
+ free(k);
}
return 0;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *t, *k;
int r;
return -ENOMEM;
r = unit_merge_by_name(u, k);
- free(k);
- if (r < 0)
- return r;
+ if (r < 0) {
+ log_error("Failed to add name %s, ignoring: %s", k, strerror(-r));
+ free(k);
+ return 0;
+ }
+
+ free(k);
}
return 0;
}
-static int config_parse_description(
+static int config_parse_string_printf(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
Unit *u = userdata;
+ char **s = data;
char *k;
assert(filename);
assert(lvalue);
assert(rvalue);
- assert(data);
+ assert(s);
+ assert(u);
if (!(k = unit_full_printf(u, rvalue)))
return -ENOMEM;
- free(u->meta.description);
-
+ free(*s);
if (*k)
- u->meta.description = k;
+ *s = k;
else {
free(k);
- u->meta.description = NULL;
+ *s = NULL;
}
return 0;
}
-static int config_parse_listen(
+static int config_parse_strv_printf(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
+ Unit *u = userdata;
+ char *k;
int r;
- SocketPort *p;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(u);
+
+ k = unit_full_printf(u, rvalue);
+ if (!k)
+ return -ENOMEM;
+
+ r = config_parse_strv(filename, line, section, lvalue, ltype, k, data, userdata);
+ free(k);
+
+ return r;
+}
+
+static int config_parse_path_printf(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Unit *u = userdata;
+ char **s = data;
+ char *k;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(s);
+ assert(u);
+
+ if (!(k = unit_full_printf(u, rvalue)))
+ return -ENOMEM;
+
+ if (!path_is_absolute(k)) {
+ log_error("[%s:%u] Not an absolute path: %s", filename, line, k);
+ free(k);
+ return -EINVAL;
+ }
+
+ path_kill_slashes(k);
+
+ free(*s);
+ *s = k;
+
+ return 0;
+}
+
+static int config_parse_listen(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ SocketPort *p, *tail;
Socket *s;
assert(filename);
if (streq(lvalue, "ListenFIFO")) {
p->type = SOCKET_FIFO;
- if (!(p->path = strdup(rvalue))) {
+ if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
+ free(p);
+ return -ENOMEM;
+ }
+
+ path_kill_slashes(p->path);
+
+ } else if (streq(lvalue, "ListenSpecial")) {
+ p->type = SOCKET_SPECIAL;
+
+ if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
+ free(p);
+ return -ENOMEM;
+ }
+
+ path_kill_slashes(p->path);
+
+ } else if (streq(lvalue, "ListenMessageQueue")) {
+
+ p->type = SOCKET_MQUEUE;
+
+ if (!(p->path = unit_full_printf(UNIT(s), rvalue))) {
free(p);
return -ENOMEM;
}
path_kill_slashes(p->path);
+
+ } else if (streq(lvalue, "ListenNetlink")) {
+ char *k;
+ int r;
+
+ p->type = SOCKET_SOCKET;
+ k = unit_full_printf(UNIT(s), rvalue);
+ r = socket_address_parse_netlink(&p->address, k);
+ free(k);
+
+ if (r < 0) {
+ log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue);
+ free(p);
+ return 0;
+ }
+
} else {
+ char *k;
+ int r;
+
p->type = SOCKET_SOCKET;
+ k = unit_full_printf(UNIT(s), rvalue);
+ r = socket_address_parse(&p->address, k);
+ free(k);
- if ((r = socket_address_parse(&p->address, rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse address value: %s", filename, line, rvalue);
+ if (r < 0) {
+ log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue);
free(p);
- return r;
+ return 0;
}
if (streq(lvalue, "ListenStream"))
}
if (socket_address_family(&p->address) != AF_LOCAL && p->address.type == SOCK_SEQPACKET) {
+ log_error("[%s:%u] Address family not supported, ignoring: %s", filename, line, rvalue);
free(p);
- return -EPROTONOSUPPORT;
+ return 0;
}
}
p->fd = -1;
- LIST_PREPEND(SocketPort, port, s->ports, p);
+
+ if (s->ports) {
+ LIST_FIND_TAIL(SocketPort, port, s->ports, tail);
+ LIST_INSERT_AFTER(SocketPort, port, s->ports, tail, p);
+ } else
+ LIST_PREPEND(SocketPort, port, s->ports, p);
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
int r;
if ((r = parse_boolean(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse bind IPv6 only value: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse bind IPv6 only value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
s->bind_ipv6_only = r ? SOCKET_ADDRESS_IPV6_ONLY : SOCKET_ADDRESS_BOTH;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
ExecContext *c = data;
- int priority, r;
+ int priority;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = safe_atoi(rvalue, &priority)) < 0) {
- log_error("[%s:%u] Failed to parse nice priority: %s", filename, line, rvalue);
- return r;
+ if (safe_atoi(rvalue, &priority) < 0) {
+ log_error("[%s:%u] Failed to parse nice priority, ignoring: %s. ", filename, line, rvalue);
+ return 0;
}
if (priority < PRIO_MIN || priority >= PRIO_MAX) {
- log_error("[%s:%u] Nice priority out of range: %s", filename, line, rvalue);
- return -ERANGE;
+ log_error("[%s:%u] Nice priority out of range, ignoring: %s", filename, line, rvalue);
+ return 0;
}
c->nice = priority;
- c->nice_set = false;
+ c->nice_set = true;
return 0;
}
-static int config_parse_oom_adjust(
+static int config_parse_oom_score_adjust(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
ExecContext *c = data;
- int oa, r;
+ int oa;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = safe_atoi(rvalue, &oa)) < 0) {
- log_error("[%s:%u] Failed to parse OOM adjust value: %s", filename, line, rvalue);
- return r;
+ if (safe_atoi(rvalue, &oa) < 0) {
+ log_error("[%s:%u] Failed to parse the OOM score adjust value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- if (oa < OOM_DISABLE || oa > OOM_ADJUST_MAX) {
- log_error("[%s:%u] OOM adjust value out of range: %s", filename, line, rvalue);
- return -ERANGE;
+ if (oa < OOM_SCORE_ADJ_MIN || oa > OOM_SCORE_ADJ_MAX) {
+ log_error("[%s:%u] OOM score adjust value out of range, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- c->oom_adjust = oa;
- c->oom_adjust_set = true;
+ c->oom_score_adjust = oa;
+ c->oom_score_adjust_set = true;
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
errno = 0;
l = strtol(rvalue, &x, 8);
if (!x || *x || errno) {
- log_error("[%s:%u] Failed to parse mode value: %s", filename, line, rvalue);
- return errno ? -errno : -EINVAL;
+ log_error("[%s:%u] Failed to parse mode value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
if (l < 0000 || l > 07777) {
- log_error("[%s:%u] mode value out of range: %s", filename, line, rvalue);
- return -ERANGE;
+ log_error("[%s:%u] mode value out of range, ignoring: %s", filename, line, rvalue);
+ return 0;
}
*m = (mode_t) l;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
- ExecCommand **e = data, *nce = NULL;
- char **n;
- char *w;
+ ExecCommand **e = data, *nce;
+ char *path, **n;
unsigned k;
- size_t l;
- char *state, *path = NULL;
- bool honour_argv0, write_to_path;
assert(filename);
assert(lvalue);
assert(rvalue);
- assert(data);
+ assert(e);
/* We accept an absolute path as first argument, or
* alternatively an absolute prefixed with @ to allow
* overriding of argv[0]. */
- honour_argv0 = rvalue[0] == '@';
+ for (;;) {
+ char *w;
+ size_t l;
+ char *state;
+ bool honour_argv0 = false, ignore = false;
+
+ path = NULL;
+ nce = NULL;
+ n = NULL;
- if (rvalue[honour_argv0 ? 1 : 0] != '/') {
- log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue);
- return -EINVAL;
- }
+ rvalue += strspn(rvalue, WHITESPACE);
- k = 0;
- FOREACH_WORD_QUOTED(w, l, rvalue, state)
- k++;
+ if (rvalue[0] == 0)
+ break;
- if (!(n = new(char*, k + (honour_argv0 ? 0 : 1))))
- return -ENOMEM;
+ if (rvalue[0] == '-') {
+ ignore = true;
+ rvalue ++;
+ }
- k = 0;
- write_to_path = honour_argv0;
- FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- if (write_to_path) {
- if (!(path = strndup(w+1, l-1)))
- goto fail;
- write_to_path = false;
- } else {
- if (!(n[k++] = strndup(w, l)))
- goto fail;
+ if (rvalue[0] == '@') {
+ honour_argv0 = true;
+ rvalue ++;
}
- }
- n[k] = NULL;
+ if (*rvalue != '/') {
+ log_error("[%s:%u] Invalid executable path in command line, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
- if (!n[0]) {
- log_error("[%s:%u] Invalid command line: %s", filename, line, rvalue);
- strv_free(n);
- return -EINVAL;
- }
+ k = 0;
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ if (strncmp(w, ";", MAX(l, 1U)) == 0)
+ break;
- if (!path)
- if (!(path = strdup(n[0])))
- goto fail;
+ k++;
+ }
+
+ if (!(n = new(char*, k + !honour_argv0)))
+ return -ENOMEM;
+
+ k = 0;
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ if (strncmp(w, ";", MAX(l, 1U)) == 0)
+ break;
+
+ if (honour_argv0 && w == rvalue) {
+ assert(!path);
+ if (!(path = cunescape_length(w, l)))
+ goto fail;
+ } else {
+ if (!(n[k++] = cunescape_length(w, l)))
+ goto fail;
+ }
+ }
+
+ n[k] = NULL;
+
+ if (!n[0]) {
+ log_error("[%s:%u] Invalid command line, ignoring: %s", filename, line, rvalue);
+ strv_free(n);
+ return 0;
+ }
- assert(path_is_absolute(path));
+ if (!path)
+ if (!(path = strdup(n[0])))
+ goto fail;
+
+ assert(path_is_absolute(path));
+
+ if (!(nce = new0(ExecCommand, 1)))
+ goto fail;
- if (!(nce = new0(ExecCommand, 1)))
- goto fail;
+ nce->argv = n;
+ nce->path = path;
+ nce->ignore = ignore;
- nce->argv = n;
- nce->path = path;
+ path_kill_slashes(nce->path);
- path_kill_slashes(nce->path);
+ exec_command_append_list(e, nce);
- exec_command_append_list(e, nce);
+ rvalue = state;
+ }
return 0;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
usec_t *usec = data;
- int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = parse_usec(rvalue, usec)) < 0) {
- log_error("[%s:%u] Failed to parse time value: %s", filename, line, rvalue);
- return r;
+ if (parse_usec(rvalue, usec) < 0) {
+ log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
return 0;
}
-DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type");
-DEFINE_CONFIG_PARSE_ENUM(config_parse_service_restart, service_restart, ServiceRestart, "Failed to parse service restart specifier");
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type");
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_service_restart, service_restart, ServiceRestart, "Failed to parse service restart specifier");
static int config_parse_bindtodevice(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
return 0;
}
-DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier");
-DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier");
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier");
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier");
static int config_parse_facility(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(rvalue);
assert(data);
- if ((x = log_facility_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse log facility: %s", filename, line, rvalue);
- return -EBADMSG;
+ if ((x = log_facility_unshifted_from_string(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse log facility, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- *o = LOG_MAKEPRI(x, LOG_PRI(*o));
+ *o = (x << 3) | LOG_PRI(*o);
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(data);
if ((x = log_level_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse log level: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse log level, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- *o = LOG_MAKEPRI(LOG_FAC(*o), x);
+ *o = (*o & LOG_FACMASK) | x;
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(data);
if ((x = ioprio_class_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse IO scheduling class: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse IO scheduling class, ignoring: %s", filename, line, rvalue);
+ return 0;
}
c->ioprio = IOPRIO_PRIO_VALUE(x, IOPRIO_PRIO_DATA(c->ioprio));
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(data);
if (safe_atoi(rvalue, &i) < 0 || i < 0 || i >= IOPRIO_BE_NR) {
- log_error("[%s:%u] Failed to parse io priority: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse io priority, ignoring: %s", filename, line, rvalue);
+ return 0;
}
c->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_PRIO_CLASS(c->ioprio), i);
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(data);
if ((x = sched_policy_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse CPU scheduling policy: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse CPU scheduling policy, ignoring: %s", filename, line, rvalue);
+ return 0;
}
c->cpu_sched_policy = x;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
/* On Linux RR/FIFO have the same range */
if (safe_atoi(rvalue, &i) < 0 || i < sched_get_priority_min(SCHED_RR) || i > sched_get_priority_max(SCHED_RR)) {
- log_error("[%s:%u] Failed to parse CPU scheduling priority: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse CPU scheduling priority, ignoring: %s", filename, line, rvalue);
+ return 0;
}
c->cpu_sched_priority = i;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
r = safe_atou(t, &cpu);
free(t);
- if (r < 0 || cpu >= CPU_SETSIZE) {
- log_error("[%s:%u] Failed to parse CPU affinity: %s", filename, line, rvalue);
- return -EBADMSG;
+ if (!(c->cpuset))
+ if (!(c->cpuset = cpu_set_malloc(&c->cpuset_ncpus)))
+ return -ENOMEM;
+
+ if (r < 0 || cpu >= c->cpuset_ncpus) {
+ log_error("[%s:%u] Failed to parse CPU affinity, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- CPU_SET(cpu, &c->cpu_affinity);
+ CPU_SET_S(cpu, CPU_ALLOC_SIZE(c->cpuset_ncpus), c->cpuset);
}
- c->cpu_affinity_set = true;
-
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
if (errno == ENOMEM)
return -ENOMEM;
- log_error("[%s:%u] Failed to parse capabilities: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse capabilities, ignoring: %s", filename, line, rvalue);
+ return 0;
}
if (c->capabilities)
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
else if (first_word(w, "noroot-locked"))
c->secure_bits |= SECURE_NOROOT_LOCKED;
else {
- log_error("[%s:%u] Failed to parse secure bits: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse secure bits, ignoring: %s", filename, line, rvalue);
+ return 0;
}
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
char *w;
size_t l;
char *state;
+ bool invert = false;
+ uint64_t sum = 0;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
+ if (rvalue[0] == '~') {
+ invert = true;
+ rvalue++;
+ }
+
+ /* Note that we store this inverted internally, since the
+ * kernel wants it like this. But we actually expose it
+ * non-inverted everywhere to have a fully normalized
+ * interface. */
+
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;
free(t);
if (r < 0) {
- log_error("[%s:%u] Failed to parse capability bounding set: %s", filename, line, rvalue);
- return -EBADMSG;
+ log_error("[%s:%u] Failed to parse capability bounding set, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- c->capability_bounding_set_drop |= 1 << cap;
+ sum |= ((uint64_t) 1ULL) << (uint64_t) cap;
}
+ if (invert)
+ c->capability_bounding_set_drop |= sum;
+ else
+ c->capability_bounding_set_drop |= ~sum;
+
return 0;
}
-static int config_parse_timer_slack_ns(
+static int config_parse_timer_slack_nsec(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
ExecContext *c = data;
unsigned long u;
- int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = safe_atolu(rvalue, &u)) < 0) {
- log_error("[%s:%u] Failed to parse time slack value: %s", filename, line, rvalue);
- return r;
+ if (safe_atolu(rvalue, &u) < 0) {
+ log_error("[%s:%u] Failed to parse time slack value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- c->timer_slack_ns = u;
+ c->timer_slack_nsec = u;
return 0;
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
struct rlimit **rl = data;
unsigned long long u;
- int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = safe_atollu(rvalue, &u)) < 0) {
- log_error("[%s:%u] Failed to parse resource value: %s", filename, line, rvalue);
- return r;
+ if (streq(rvalue, "infinity"))
+ u = (unsigned long long) RLIM_INFINITY;
+ else if (safe_atollu(rvalue, &u) < 0) {
+ log_error("[%s:%u] Failed to parse resource value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
if (!*rl)
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
size_t l;
char *state;
- FOREACH_WORD(w, l, rvalue, state) {
- char *t;
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ char *t, *k;
int r;
- if (!(t = strndup(w, l)))
+ t = strndup(w, l);
+ if (!t)
+ return -ENOMEM;
+
+ k = unit_full_printf(u, t);
+ free(t);
+
+ if (!k)
+ return -ENOMEM;
+
+ t = cunescape(k);
+ free(k);
+
+ if (!t)
return -ENOMEM;
r = unit_add_cgroup_from_text(u, t);
free(t);
- if (r < 0)
- return r;
+ if (r < 0) {
+ log_error("[%s:%u] Failed to parse cgroup value, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
}
return 0;
}
+#ifdef HAVE_SYSV_COMPAT
static int config_parse_sysv_priority(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
int *priority = data;
- int r, i;
+ int i;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
- if ((r = safe_atoi(rvalue, &i)) < 0 || i < 0) {
- log_error("[%s:%u] Failed to parse SysV start priority: %s", filename, line, rvalue);
- return r;
+ if (safe_atoi(rvalue, &i) < 0 || i < 0) {
+ log_error("[%s:%u] Failed to parse SysV start priority, ignoring: %s", filename, line, rvalue);
+ return 0;
}
*priority = (int) i;
return 0;
}
+#endif
+
+static int config_parse_fsck_passno(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ int *passno = data;
+ int i;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if (safe_atoi(rvalue, &i) || i < 0) {
+ log_error("[%s:%u] Failed to parse fsck pass number, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
+
+ *passno = (int) i;
+ return 0;
+}
+
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+
+static int config_parse_kill_signal(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ int *sig = data;
+ int r;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(sig);
+
+ if ((r = signal_from_string_try_harder(rvalue)) <= 0) {
+ log_error("[%s:%u] Failed to parse kill signal, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
-DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+ *sig = r;
+ return 0;
+}
static int config_parse_mount_flags(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(rvalue);
assert(data);
- FOREACH_WORD(w, l, rvalue, state) {
- if (strncmp(w, "shared", l) == 0)
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ if (strncmp(w, "shared", MAX(l, 6U)) == 0)
flags |= MS_SHARED;
- else if (strncmp(w, "slave", l) == 0)
+ else if (strncmp(w, "slave", MAX(l, 5U)) == 0)
flags |= MS_SLAVE;
- else if (strncmp(w, "private", l) == 0)
+ else if (strncmp(w, "private", MAX(l, 7U)) == 0)
flags |= MS_PRIVATE;
else {
- log_error("[%s:%u] Failed to parse mount flags: %s", filename, line, rvalue);
- return -EINVAL;
+ log_error("[%s:%u] Failed to parse mount flags, ignoring: %s", filename, line, rvalue);
+ return 0;
}
}
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
Timer *t = data;
usec_t u;
- int r;
TimerValue *v;
TimerBase b;
assert(data);
if ((b = timer_base_from_string(lvalue)) < 0) {
- log_error("[%s:%u] Failed to parse timer base: %s", filename, line, lvalue);
- return -EINVAL;
+ log_error("[%s:%u] Failed to parse timer base, ignoring: %s", filename, line, lvalue);
+ return 0;
}
- if ((r = parse_usec(rvalue, &u)) < 0) {
- log_error("[%s:%u] Failed to parse timer value: %s", filename, line, rvalue);
- return r;
+ if (parse_usec(rvalue, &u) < 0) {
+ log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue);
+ return 0;
}
if (!(v = new0(TimerValue, 1)))
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
Timer *t = data;
int r;
+ DBusError error;
- if (endswith(rvalue, ".timer")) {
- log_error("[%s:%u] Unit cannot be of type timer: %s", filename, line, rvalue);
- return -EINVAL;
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ dbus_error_init(&error);
+
+ if (endswith(rvalue, ".timer")) {
+ log_error("[%s:%u] Unit cannot be of type timer, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &t->unit)) < 0) {
- log_error("[%s:%u] Failed to load unit: %s", filename, line, rvalue);
- return r;
+ if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, NULL, &t->unit)) < 0) {
+ log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
+ dbus_error_free(&error);
+ return 0;
}
return 0;
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
assert(data);
if ((b = path_type_from_string(lvalue)) < 0) {
- log_error("[%s:%u] Failed to parse path type: %s", filename, line, lvalue);
- return -EINVAL;
+ log_error("[%s:%u] Failed to parse path type, ignoring: %s", filename, line, lvalue);
+ return 0;
}
if (!path_is_absolute(rvalue)) {
- log_error("[%s:%u] Path is not absolute: %s", filename, line, rvalue);
- return -EINVAL;
+ log_error("[%s:%u] Path is not absolute, ignoring: %s", filename, line, rvalue);
+ return 0;
}
if (!(s = new0(PathSpec, 1)))
unsigned line,
const char *section,
const char *lvalue,
+ int ltype,
const char *rvalue,
void *data,
void *userdata) {
Path *t = data;
int r;
+ DBusError error;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ dbus_error_init(&error);
if (endswith(rvalue, ".path")) {
- log_error("[%s:%u] Unit cannot be of type path: %s", filename, line, rvalue);
- return -EINVAL;
+ log_error("[%s:%u] Unit cannot be of type path, ignoring: %s", filename, line, rvalue);
+ return 0;
}
- if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &t->unit)) < 0) {
- log_error("[%s:%u] Failed to load unit: %s", filename, line, rvalue);
- return r;
+ if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &error, &t->unit)) < 0) {
+ log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
+ dbus_error_free(&error);
+ return 0;
+ }
+
+ return 0;
+}
+
+static int config_parse_socket_service(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Socket *s = data;
+ int r;
+ DBusError error;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ dbus_error_init(&error);
+
+ if (!endswith(rvalue, ".service")) {
+ log_error("[%s:%u] Unit must be of type service, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
+
+ if ((r = manager_load_unit(s->meta.manager, rvalue, NULL, &error, (Unit**) &s->service)) < 0) {
+ log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
+ dbus_error_free(&error);
+ return 0;
+ }
+
+ return 0;
+}
+
+static int config_parse_service_sockets(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Service *s = data;
+ int r;
+ DBusError error;
+ char *state, *w;
+ size_t l;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ dbus_error_init(&error);
+
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ char *t;
+ Unit *sock;
+
+ if (!(t = strndup(w, l)))
+ return -ENOMEM;
+
+ if (!endswith(t, ".socket")) {
+ log_error("[%s:%u] Unit must be of type socket, ignoring: %s", filename, line, rvalue);
+ free(t);
+ continue;
+ }
+
+ r = manager_load_unit(s->meta.manager, t, NULL, &error, &sock);
+ free(t);
+
+ if (r < 0) {
+ log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
+ dbus_error_free(&error);
+ continue;
+ }
+
+ if ((r = set_ensure_allocated(&s->configured_sockets, trivial_hash_func, trivial_compare_func)) < 0)
+ return r;
+
+ if ((r = set_put(s->configured_sockets, sock)) < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+static int config_parse_env_file(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ char ***env = data, **k;
+ Unit *u = userdata;
+ char *s;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ s = unit_full_printf(u, rvalue);
+ if (!s)
+ return -ENOMEM;
+
+ if (!path_is_absolute(s[0] == '-' ? s + 1 : s)) {
+ log_error("[%s:%u] Path '%s' is not absolute, ignoring.", filename, line, s);
+ free(s);
+ return 0;
+ }
+
+ k = strv_append(*env, s);
+ free(s);
+ if (!k)
+ return -ENOMEM;
+
+ strv_free(*env);
+ *env = k;
+
+ return 0;
+}
+
+static int config_parse_ip_tos(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ int *ip_tos = data, x;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if ((x = ip_tos_from_string(rvalue)) < 0)
+ if (safe_atoi(rvalue, &x) < 0) {
+ log_error("[%s:%u] Failed to parse IP TOS value, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
+
+ *ip_tos = x;
+ return 0;
+}
+
+static int config_parse_condition_path(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ ConditionType cond = ltype;
+ Unit *u = data;
+ bool trigger, negate;
+ Condition *c;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if ((trigger = rvalue[0] == '|'))
+ rvalue++;
+
+ if ((negate = rvalue[0] == '!'))
+ rvalue++;
+
+ if (!path_is_absolute(rvalue)) {
+ log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, rvalue);
+ return 0;
+ }
+
+ if (!(c = condition_new(cond, rvalue, trigger, negate)))
+ return -ENOMEM;
+
+ LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
+ return 0;
+}
+
+static int config_parse_condition_string(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ ConditionType cond = ltype;
+ Unit *u = data;
+ bool trigger, negate;
+ Condition *c;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if ((trigger = rvalue[0] == '|'))
+ rvalue++;
+
+ if ((negate = rvalue[0] == '!'))
+ rvalue++;
+
+ if (!(c = condition_new(cond, rvalue, trigger, negate)))
+ return -ENOMEM;
+
+ LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
+ return 0;
+}
+
+static int config_parse_condition_null(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Unit *u = data;
+ Condition *c;
+ bool trigger, negate;
+ int b;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if ((trigger = rvalue[0] == '|'))
+ rvalue++;
+
+ if ((negate = rvalue[0] == '!'))
+ rvalue++;
+
+ if ((b = parse_boolean(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse boolean value in condition, ignoring: %s", filename, line, rvalue);
+ return 0;
}
+ if (!b)
+ negate = !negate;
+
+ if (!(c = condition_new(CONDITION_NULL, NULL, trigger, negate)))
+ return -ENOMEM;
+
+ LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
return 0;
}
+static DEFINE_CONFIG_PARSE_ENUM(config_parse_notify_access, notify_access, NotifyAccess, "Failed to parse notify access specifier");
+
#define FOLLOW_MAX 8
static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
path_kill_slashes(*filename);
/* Add the file name we are currently looking at to
- * the names of this unit */
+ * the names of this unit, but only if it is a valid
+ * unit name. */
name = file_name_from_path(*filename);
- if (!(id = set_get(names, name))) {
- if (!(id = strdup(name)))
- return -ENOMEM;
+ if (unit_name_is_valid(name, true)) {
- if ((r = set_put(names, id)) < 0) {
- free(id);
- return r;
+ id = set_get(names, name);
+ if (!id) {
+ id = strdup(name);
+ if (!id)
+ return -ENOMEM;
+
+ r = set_put(names, id);
+ if (r < 0) {
+ free(id);
+ return r;
+ }
}
}
*filename = target;
}
- if (!(f = fdopen(fd, "r"))) {
+ if (!(f = fdopen(fd, "re"))) {
r = -errno;
close_nointr_nofail(fd);
return r;
{ config_parse_bool, "BOOLEAN" },
{ config_parse_string, "STRING" },
{ config_parse_path, "PATH" },
+ { config_parse_path_printf, "PATH" },
{ config_parse_strv, "STRING [...]" },
{ config_parse_nice, "NICE" },
- { config_parse_oom_adjust, "OOMADJUST" },
+ { config_parse_oom_score_adjust, "OOMSCOREADJUST" },
{ config_parse_io_class, "IOCLASS" },
{ config_parse_io_priority, "IOPRIORITY" },
{ config_parse_cpu_sched_policy, "CPUSCHEDPOLICY" },
{ config_parse_cpu_sched_prio, "CPUSCHEDPRIO" },
{ config_parse_cpu_affinity, "CPUAFFINITY" },
{ config_parse_mode, "MODE" },
+ { config_parse_env_file, "FILE" },
{ config_parse_output, "OUTPUT" },
{ config_parse_input, "INPUT" },
{ config_parse_facility, "FACILITY" },
{ config_parse_capabilities, "CAPABILITIES" },
{ config_parse_secure_bits, "SECUREBITS" },
{ config_parse_bounding_set, "BOUNDINGSET" },
- { config_parse_timer_slack_ns, "TIMERSLACK" },
+ { config_parse_timer_slack_nsec, "TIMERSLACK" },
{ config_parse_limit, "LIMIT" },
{ config_parse_cgroup, "CGROUP [...]" },
{ config_parse_deps, "UNIT [...]" },
{ config_parse_exec, "PATH [ARGUMENT [...]]" },
{ config_parse_service_type, "SERVICETYPE" },
{ config_parse_service_restart, "SERVICERESTART" },
+#ifdef HAVE_SYSV_COMPAT
{ config_parse_sysv_priority, "SYSVPRIORITY" },
+#else
+ { config_parse_warn_compat, "NOTSUPPORTED" },
+#endif
{ config_parse_kill_mode, "KILLMODE" },
+ { config_parse_kill_signal, "SIGNAL" },
{ config_parse_listen, "SOCKET [...]" },
{ config_parse_socket_bind, "SOCKETBIND" },
{ config_parse_bindtodevice, "NETWORKINTERFACE" },
{ config_parse_usec, "SECONDS" },
{ config_parse_path_strv, "PATH [...]" },
{ config_parse_mount_flags, "MOUNTFLAG [...]" },
- { config_parse_description, "DESCRIPTION" },
+ { config_parse_string_printf, "STRING" },
{ config_parse_timer, "TIMER" },
{ config_parse_timer_unit, "NAME" },
+ { config_parse_path_spec, "PATH" },
+ { config_parse_path_unit, "UNIT" },
+ { config_parse_notify_access, "ACCESS" },
+ { config_parse_ip_tos, "TOS" },
+ { config_parse_condition_path, "CONDITION" },
+ { config_parse_condition_string, "CONDITION" },
+ { config_parse_condition_null, "CONDITION" },
};
assert(f);
};
#define EXEC_CONTEXT_CONFIG_ITEMS(context, 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 }, \
- { "IOSchedulingClass", config_parse_io_class, &(context), section }, \
- { "IOSchedulingPriority", config_parse_io_priority, &(context), section }, \
- { "CPUSchedulingPolicy", config_parse_cpu_sched_policy,&(context), section }, \
- { "CPUSchedulingPriority", config_parse_cpu_sched_prio, &(context), section }, \
- { "CPUSchedulingResetOnFork", config_parse_bool, &(context).cpu_sched_reset_on_fork, section }, \
- { "CPUAffinity", config_parse_cpu_affinity, &(context), section }, \
- { "UMask", config_parse_mode, &(context).umask, section }, \
- { "Environment", config_parse_strv, &(context).environment, section }, \
- { "StandardInput", config_parse_input, &(context).std_input, section }, \
- { "StandardOutput", config_parse_output, &(context).std_output, section }, \
- { "StandardError", config_parse_output, &(context).std_error, section }, \
- { "TTYPath", config_parse_path, &(context).tty_path, 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 }, \
- { "SyslogNoPrefix", config_parse_bool, &(context).syslog_no_prefix, section }, \
- { "Capabilities", config_parse_capabilities, &(context), section }, \
- { "SecureBits", config_parse_secure_bits, &(context), section }, \
- { "CapabilityBoundingSetDrop", config_parse_bounding_set, &(context), section }, \
- { "TimerSlackNS", config_parse_timer_slack_ns, &(context), section }, \
- { "LimitCPU", config_parse_limit, &(context).rlimit[RLIMIT_CPU], section }, \
- { "LimitFSIZE", config_parse_limit, &(context).rlimit[RLIMIT_FSIZE], section }, \
- { "LimitDATA", config_parse_limit, &(context).rlimit[RLIMIT_DATA], section }, \
- { "LimitSTACK", config_parse_limit, &(context).rlimit[RLIMIT_STACK], section }, \
- { "LimitCORE", config_parse_limit, &(context).rlimit[RLIMIT_CORE], section }, \
- { "LimitRSS", config_parse_limit, &(context).rlimit[RLIMIT_RSS], section }, \
- { "LimitNOFILE", config_parse_limit, &(context).rlimit[RLIMIT_NOFILE], section }, \
- { "LimitAS", config_parse_limit, &(context).rlimit[RLIMIT_AS], section }, \
- { "LimitNPROC", config_parse_limit, &(context).rlimit[RLIMIT_NPROC], section }, \
- { "LimitMEMLOCK", config_parse_limit, &(context).rlimit[RLIMIT_MEMLOCK], section }, \
- { "LimitLOCKS", config_parse_limit, &(context).rlimit[RLIMIT_LOCKS], section }, \
- { "LimitSIGPENDING", config_parse_limit, &(context).rlimit[RLIMIT_SIGPENDING], section }, \
- { "LimitMSGQUEUE", config_parse_limit, &(context).rlimit[RLIMIT_MSGQUEUE], section }, \
- { "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 }, \
- { "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 }
+ { "WorkingDirectory", config_parse_path_printf, 0, &(context).working_directory, section }, \
+ { "RootDirectory", config_parse_path_printf, 0, &(context).root_directory, section }, \
+ { "User", config_parse_string_printf, 0, &(context).user, section }, \
+ { "Group", config_parse_string_printf, 0, &(context).group, section }, \
+ { "SupplementaryGroups", config_parse_strv, 0, &(context).supplementary_groups, section }, \
+ { "Nice", config_parse_nice, 0, &(context), section }, \
+ { "OOMScoreAdjust", config_parse_oom_score_adjust,0, &(context), section }, \
+ { "IOSchedulingClass", config_parse_io_class, 0, &(context), section }, \
+ { "IOSchedulingPriority", config_parse_io_priority, 0, &(context), section }, \
+ { "CPUSchedulingPolicy", config_parse_cpu_sched_policy,0, &(context), section }, \
+ { "CPUSchedulingPriority", config_parse_cpu_sched_prio, 0, &(context), section }, \
+ { "CPUSchedulingResetOnFork", config_parse_bool, 0, &(context).cpu_sched_reset_on_fork, section }, \
+ { "CPUAffinity", config_parse_cpu_affinity, 0, &(context), section }, \
+ { "UMask", config_parse_mode, 0, &(context).umask, section }, \
+ { "Environment", config_parse_strv_printf, 0, &(context).environment, section }, \
+ { "EnvironmentFile", config_parse_env_file, 0, &(context).environment_files, section }, \
+ { "StandardInput", config_parse_input, 0, &(context).std_input, section }, \
+ { "StandardOutput", config_parse_output, 0, &(context).std_output, section }, \
+ { "StandardError", config_parse_output, 0, &(context).std_error, section }, \
+ { "TTYPath", config_parse_path_printf, 0, &(context).tty_path, section }, \
+ { "TTYReset", config_parse_bool, 0, &(context).tty_reset, section }, \
+ { "TTYVHangup", config_parse_bool, 0, &(context).tty_vhangup, section }, \
+ { "TTYVTDisallocate", config_parse_bool, 0, &(context).tty_vt_disallocate, section }, \
+ { "SyslogIdentifier", config_parse_string_printf, 0, &(context).syslog_identifier, section }, \
+ { "SyslogFacility", config_parse_facility, 0, &(context).syslog_priority, section }, \
+ { "SyslogLevel", config_parse_level, 0, &(context).syslog_priority, section }, \
+ { "SyslogLevelPrefix", config_parse_bool, 0, &(context).syslog_level_prefix, section }, \
+ { "Capabilities", config_parse_capabilities, 0, &(context), section }, \
+ { "SecureBits", config_parse_secure_bits, 0, &(context), section }, \
+ { "CapabilityBoundingSet", config_parse_bounding_set, 0, &(context), section }, \
+ { "TimerSlackNSec", config_parse_timer_slack_nsec,0, &(context), section }, \
+ { "LimitCPU", config_parse_limit, 0, &(context).rlimit[RLIMIT_CPU], section }, \
+ { "LimitFSIZE", config_parse_limit, 0, &(context).rlimit[RLIMIT_FSIZE], section }, \
+ { "LimitDATA", config_parse_limit, 0, &(context).rlimit[RLIMIT_DATA], section }, \
+ { "LimitSTACK", config_parse_limit, 0, &(context).rlimit[RLIMIT_STACK], section }, \
+ { "LimitCORE", config_parse_limit, 0, &(context).rlimit[RLIMIT_CORE], section }, \
+ { "LimitRSS", config_parse_limit, 0, &(context).rlimit[RLIMIT_RSS], section }, \
+ { "LimitNOFILE", config_parse_limit, 0, &(context).rlimit[RLIMIT_NOFILE], section }, \
+ { "LimitAS", config_parse_limit, 0, &(context).rlimit[RLIMIT_AS], section }, \
+ { "LimitNPROC", config_parse_limit, 0, &(context).rlimit[RLIMIT_NPROC], section }, \
+ { "LimitMEMLOCK", config_parse_limit, 0, &(context).rlimit[RLIMIT_MEMLOCK], section }, \
+ { "LimitLOCKS", config_parse_limit, 0, &(context).rlimit[RLIMIT_LOCKS], section }, \
+ { "LimitSIGPENDING", config_parse_limit, 0, &(context).rlimit[RLIMIT_SIGPENDING], section }, \
+ { "LimitMSGQUEUE", config_parse_limit, 0, &(context).rlimit[RLIMIT_MSGQUEUE], section }, \
+ { "LimitNICE", config_parse_limit, 0, &(context).rlimit[RLIMIT_NICE], section }, \
+ { "LimitRTPRIO", config_parse_limit, 0, &(context).rlimit[RLIMIT_RTPRIO], section }, \
+ { "LimitRTTIME", config_parse_limit, 0, &(context).rlimit[RLIMIT_RTTIME], section }, \
+ { "ControlGroup", config_parse_cgroup, 0, u, section }, \
+ { "ReadWriteDirectories", config_parse_path_strv, 0, &(context).read_write_dirs, section }, \
+ { "ReadOnlyDirectories", config_parse_path_strv, 0, &(context).read_only_dirs, section }, \
+ { "InaccessibleDirectories",config_parse_path_strv, 0, &(context).inaccessible_dirs, section }, \
+ { "PrivateTmp", config_parse_bool, 0, &(context).private_tmp, section }, \
+ { "MountFlags", config_parse_mount_flags, 0, &(context), section }, \
+ { "TCPWrapName", config_parse_string_printf, 0, &(context).tcpwrap_name, section }, \
+ { "PAMName", config_parse_string_printf, 0, &(context).pam_name, section }, \
+ { "KillMode", config_parse_kill_mode, 0, &(context).kill_mode, section }, \
+ { "KillSignal", config_parse_kill_signal, 0, &(context).kill_signal, section }, \
+ { "SendSIGKILL", config_parse_bool, 0, &(context).send_sigkill, section }, \
+ { "UtmpIdentifier", config_parse_string_printf, 0, &(context).utmp_id, section }, \
+ { "ControlGroupModify", config_parse_bool, 0, &(context).control_group_modify, section }
const ConfigItem items[] = {
- { "Names", config_parse_names, u, "Unit" },
- { "Description", config_parse_description, u, "Unit" },
- { "Requires", config_parse_deps, UINT_TO_PTR(UNIT_REQUIRES), "Unit" },
- { "RequiresOverridable", config_parse_deps, UINT_TO_PTR(UNIT_REQUIRES_OVERRIDABLE), "Unit" },
- { "Requisite", config_parse_deps, UINT_TO_PTR(UNIT_REQUISITE), "Unit" },
- { "RequisiteOverridable", config_parse_deps, UINT_TO_PTR(UNIT_REQUISITE_OVERRIDABLE), "Unit" },
- { "Wants", config_parse_deps, UINT_TO_PTR(UNIT_WANTS), "Unit" },
- { "Conflicts", config_parse_deps, UINT_TO_PTR(UNIT_CONFLICTS), "Unit" },
- { "Before", config_parse_deps, UINT_TO_PTR(UNIT_BEFORE), "Unit" },
- { "After", config_parse_deps, UINT_TO_PTR(UNIT_AFTER), "Unit" },
- { "RecursiveStop", config_parse_bool, &u->meta.recursive_stop, "Unit" },
- { "StopWhenUnneeded", config_parse_bool, &u->meta.stop_when_unneeded, "Unit" },
- { "OnlyByDependency", config_parse_bool, &u->meta.only_by_dependency, "Unit" },
-
- { "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.type, "Service" },
- { "Restart", config_parse_service_restart, &u->service.restart, "Service" },
- { "PermissionsStartOnly", config_parse_bool, &u->service.permissions_start_only, "Service" },
- { "RootDirectoryStartOnly", config_parse_bool, &u->service.root_directory_start_only, "Service" },
- { "ValidNoProcess", config_parse_bool, &u->service.valid_no_process, "Service" },
- { "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" },
- { "KillMode", config_parse_kill_mode, &u->service.kill_mode, "Service" },
- { "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" },
- { "BusName", config_parse_string, &u->service.bus_name, "Service" },
+ { "Names", config_parse_names, 0, u, "Unit" },
+ { "Description", config_parse_string_printf, 0, &u->meta.description, "Unit" },
+ { "Requires", config_parse_deps, 0, UINT_TO_PTR(UNIT_REQUIRES), "Unit" },
+ { "RequiresOverridable", config_parse_deps, 0, UINT_TO_PTR(UNIT_REQUIRES_OVERRIDABLE), "Unit" },
+ { "Requisite", config_parse_deps, 0, UINT_TO_PTR(UNIT_REQUISITE), "Unit" },
+ { "RequisiteOverridable", config_parse_deps, 0, UINT_TO_PTR(UNIT_REQUISITE_OVERRIDABLE), "Unit" },
+ { "Wants", config_parse_deps, 0, UINT_TO_PTR(UNIT_WANTS), "Unit" },
+ { "BindTo", config_parse_deps, 0, UINT_TO_PTR(UNIT_BIND_TO), "Unit" },
+ { "Conflicts", config_parse_deps, 0, UINT_TO_PTR(UNIT_CONFLICTS), "Unit" },
+ { "Before", config_parse_deps, 0, UINT_TO_PTR(UNIT_BEFORE), "Unit" },
+ { "After", config_parse_deps, 0, UINT_TO_PTR(UNIT_AFTER), "Unit" },
+ { "OnFailure", config_parse_deps, 0, UINT_TO_PTR(UNIT_ON_FAILURE), "Unit" },
+ { "StopWhenUnneeded", config_parse_bool, 0, &u->meta.stop_when_unneeded, "Unit" },
+ { "RefuseManualStart", config_parse_bool, 0, &u->meta.refuse_manual_start, "Unit" },
+ { "RefuseManualStop", config_parse_bool, 0, &u->meta.refuse_manual_stop, "Unit" },
+ { "AllowIsolate", config_parse_bool, 0, &u->meta.allow_isolate, "Unit" },
+ { "DefaultDependencies", config_parse_bool, 0, &u->meta.default_dependencies, "Unit" },
+ { "OnFailureIsolate", config_parse_bool, 0, &u->meta.on_failure_isolate, "Unit" },
+ { "IgnoreOnIsolate", config_parse_bool, 0, &u->meta.ignore_on_isolate, "Unit" },
+ { "IgnoreOnSnapshot", config_parse_bool, 0, &u->meta.ignore_on_snapshot, "Unit" },
+ { "JobTimeoutSec", config_parse_usec, 0, &u->meta.job_timeout, "Unit" },
+ { "ConditionPathExists", config_parse_condition_path, CONDITION_PATH_EXISTS, u, "Unit" },
+ { "ConditionPathExistsGlob", config_parse_condition_path, CONDITION_PATH_EXISTS_GLOB, u, "Unit" },
+ { "ConditionPathIsDirectory", config_parse_condition_path, CONDITION_PATH_IS_DIRECTORY, u, "Unit" },
+ { "ConditionDirectoryNotEmpty", config_parse_condition_path, CONDITION_DIRECTORY_NOT_EMPTY, u, "Unit" },
+ { "ConditionFileIsExecutable", config_parse_condition_path, CONDITION_FILE_IS_EXECUTABLE, u, "Unit" },
+ { "ConditionKernelCommandLine", config_parse_condition_string, CONDITION_KERNEL_COMMAND_LINE, u, "Unit" },
+ { "ConditionVirtualization", config_parse_condition_string, CONDITION_VIRTUALIZATION, u, "Unit" },
+ { "ConditionSecurity", config_parse_condition_string, CONDITION_SECURITY, u, "Unit" },
+ { "ConditionNull", config_parse_condition_null, 0, u, "Unit" },
+
+ { "PIDFile", config_parse_path_printf, 0, &u->service.pid_file, "Service" },
+ { "ExecStartPre", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START_PRE, "Service" },
+ { "ExecStart", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START, "Service" },
+ { "ExecStartPost", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_START_POST, "Service" },
+ { "ExecReload", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_RELOAD, "Service" },
+ { "ExecStop", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_STOP, "Service" },
+ { "ExecStopPost", config_parse_exec, 0, u->service.exec_command+SERVICE_EXEC_STOP_POST, "Service" },
+ { "RestartSec", config_parse_usec, 0, &u->service.restart_usec, "Service" },
+ { "TimeoutSec", config_parse_usec, 0, &u->service.timeout_usec, "Service" },
+ { "Type", config_parse_service_type, 0, &u->service.type, "Service" },
+ { "Restart", config_parse_service_restart, 0, &u->service.restart, "Service" },
+ { "PermissionsStartOnly", config_parse_bool, 0, &u->service.permissions_start_only, "Service" },
+ { "RootDirectoryStartOnly", config_parse_bool, 0, &u->service.root_directory_start_only, "Service" },
+ { "RemainAfterExit", config_parse_bool, 0, &u->service.remain_after_exit, "Service" },
+ { "GuessMainPID", config_parse_bool, 0, &u->service.guess_main_pid, "Service" },
+#ifdef HAVE_SYSV_COMPAT
+ { "SysVStartPriority", config_parse_sysv_priority, 0, &u->service.sysv_start_priority, "Service" },
+#else
+ { "SysVStartPriority", config_parse_warn_compat, 0, NULL, "Service" },
+#endif
+ { "NonBlocking", config_parse_bool, 0, &u->service.exec_context.non_blocking, "Service" },
+ { "BusName", config_parse_string_printf, 0, &u->service.bus_name, "Service" },
+ { "NotifyAccess", config_parse_notify_access, 0, &u->service.notify_access, "Service" },
+ { "Sockets", config_parse_service_sockets, 0, &u->service, "Service" },
+ { "FsckPassNo", config_parse_fsck_passno, 0, &u->service.fsck_passno, "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" },
- { "TimeoutSec", config_parse_usec, &u->socket.timeout_usec, "Socket" },
- { "DirectoryMode", config_parse_mode, &u->socket.directory_mode, "Socket" },
- { "SocketMode", config_parse_mode, &u->socket.socket_mode, "Socket" },
- { "KillMode", config_parse_kill_mode, &u->socket.kill_mode, "Socket" },
- { "Accept", config_parse_bool, &u->socket.accept, "Socket" },
+ { "ListenStream", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenDatagram", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenSequentialPacket", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenFIFO", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenNetlink", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenSpecial", config_parse_listen, 0, &u->socket, "Socket" },
+ { "ListenMessageQueue", config_parse_listen, 0, &u->socket, "Socket" },
+ { "BindIPv6Only", config_parse_socket_bind, 0, &u->socket, "Socket" },
+ { "Backlog", config_parse_unsigned, 0, &u->socket.backlog, "Socket" },
+ { "BindToDevice", config_parse_bindtodevice, 0, &u->socket, "Socket" },
+ { "ExecStartPre", config_parse_exec, 0, u->socket.exec_command+SOCKET_EXEC_START_PRE, "Socket" },
+ { "ExecStartPost", config_parse_exec, 0, u->socket.exec_command+SOCKET_EXEC_START_POST, "Socket" },
+ { "ExecStopPre", config_parse_exec, 0, u->socket.exec_command+SOCKET_EXEC_STOP_PRE, "Socket" },
+ { "ExecStopPost", config_parse_exec, 0, u->socket.exec_command+SOCKET_EXEC_STOP_POST, "Socket" },
+ { "TimeoutSec", config_parse_usec, 0, &u->socket.timeout_usec, "Socket" },
+ { "DirectoryMode", config_parse_mode, 0, &u->socket.directory_mode, "Socket" },
+ { "SocketMode", config_parse_mode, 0, &u->socket.socket_mode, "Socket" },
+ { "Accept", config_parse_bool, 0, &u->socket.accept, "Socket" },
+ { "MaxConnections", config_parse_unsigned, 0, &u->socket.max_connections, "Socket" },
+ { "KeepAlive", config_parse_bool, 0, &u->socket.keep_alive, "Socket" },
+ { "Priority", config_parse_int, 0, &u->socket.priority, "Socket" },
+ { "ReceiveBuffer", config_parse_size, 0, &u->socket.receive_buffer, "Socket" },
+ { "SendBuffer", config_parse_size, 0, &u->socket.send_buffer, "Socket" },
+ { "IPTOS", config_parse_ip_tos, 0, &u->socket.ip_tos, "Socket" },
+ { "IPTTL", config_parse_int, 0, &u->socket.ip_ttl, "Socket" },
+ { "Mark", config_parse_int, 0, &u->socket.mark, "Socket" },
+ { "PipeSize", config_parse_size, 0, &u->socket.pipe_size, "Socket" },
+ { "FreeBind", config_parse_bool, 0, &u->socket.free_bind, "Socket" },
+ { "Transparent", config_parse_bool, 0, &u->socket.transparent, "Socket" },
+ { "Broadcast", config_parse_bool, 0, &u->socket.broadcast, "Socket" },
+ { "TCPCongestion", config_parse_string, 0, &u->socket.tcp_congestion, "Socket" },
+ { "MessageQueueMaxMessages", config_parse_long, 0, &u->socket.mq_maxmsg, "Socket" },
+ { "MessageQueueMessageSize", config_parse_long, 0, &u->socket.mq_msgsize, "Socket" },
+ { "Service", config_parse_socket_service, 0, &u->socket, "Socket" },
EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"),
- { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" },
- { "Where", config_parse_path, &u->mount.where, "Mount" },
- { "Options", config_parse_string, &u->mount.parameters_fragment.options, "Mount" },
- { "Type", config_parse_string, &u->mount.parameters_fragment.fstype, "Mount" },
- { "TimeoutSec", config_parse_usec, &u->mount.timeout_usec, "Mount" },
- { "KillMode", config_parse_kill_mode, &u->mount.kill_mode, "Mount" },
+ { "What", config_parse_string, 0, &u->mount.parameters_fragment.what, "Mount" },
+ { "Where", config_parse_path, 0, &u->mount.where, "Mount" },
+ { "Options", config_parse_string, 0, &u->mount.parameters_fragment.options, "Mount" },
+ { "Type", config_parse_string, 0, &u->mount.parameters_fragment.fstype, "Mount" },
+ { "TimeoutSec", config_parse_usec, 0, &u->mount.timeout_usec, "Mount" },
+ { "DirectoryMode", config_parse_mode, 0, &u->mount.directory_mode, "Mount" },
EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"),
- { "Where", config_parse_path, &u->automount.where, "Automount" },
-
- { "What", config_parse_path, &u->swap.parameters_fragment.what, "Swap" },
- { "Priority", config_parse_int, &u->swap.parameters_fragment.priority, "Swap" },
-
- { "OnActive", config_parse_timer, &u->timer, "Timer" },
- { "OnBoot", config_parse_timer, &u->timer, "Timer" },
- { "OnStartup", config_parse_timer, &u->timer, "Timer" },
- { "OnUnitActive", config_parse_timer, &u->timer, "Timer" },
- { "OnUnitInactive", config_parse_timer, &u->timer, "Timer" },
- { "Unit", config_parse_timer_unit, &u->timer, "Timer" },
-
- { "PathExists", config_parse_path_spec, &u->path, "Path" },
- { "PathChanged", config_parse_path_spec, &u->path, "Path" },
- { "DirectoryNotEmpty", config_parse_path_spec, &u->path, "Path" },
- { "Unit", config_parse_path_unit, &u->path, "Path" },
+ { "Where", config_parse_path, 0, &u->automount.where, "Automount" },
+ { "DirectoryMode", config_parse_mode, 0, &u->automount.directory_mode, "Automount" },
+
+ { "What", config_parse_path, 0, &u->swap.parameters_fragment.what, "Swap" },
+ { "Priority", config_parse_int, 0, &u->swap.parameters_fragment.priority, "Swap" },
+ { "TimeoutSec", config_parse_usec, 0, &u->swap.timeout_usec, "Swap" },
+ EXEC_CONTEXT_CONFIG_ITEMS(u->swap.exec_context, "Swap"),
+
+ { "OnActiveSec", config_parse_timer, 0, &u->timer, "Timer" },
+ { "OnBootSec", config_parse_timer, 0, &u->timer, "Timer" },
+ { "OnStartupSec", config_parse_timer, 0, &u->timer, "Timer" },
+ { "OnUnitActiveSec", config_parse_timer, 0, &u->timer, "Timer" },
+ { "OnUnitInactiveSec", config_parse_timer, 0, &u->timer, "Timer" },
+ { "Unit", config_parse_timer_unit, 0, &u->timer, "Timer" },
+
+ { "PathExists", config_parse_path_spec, 0, &u->path, "Path" },
+ { "PathExistsGlob", config_parse_path_spec, 0, &u->path, "Path" },
+ { "PathChanged", config_parse_path_spec, 0, &u->path, "Path" },
+ { "DirectoryNotEmpty", config_parse_path_spec, 0, &u->path, "Path" },
+ { "Unit", config_parse_path_unit, 0, &u->path, "Path" },
+ { "MakeDirectory", config_parse_bool, 0, &u->path.make_directory, "Path" },
+ { "DirectoryMode", config_parse_mode, 0, &u->path.directory_mode, "Path" },
/* The [Install] section is ignored here. */
- { "Alias", NULL, NULL, "Install" },
- { "WantedBy", NULL, NULL, "Install" },
- { "Also", NULL, NULL, "Install" },
+ { "Alias", NULL, 0, NULL, "Install" },
+ { "WantedBy", NULL, 0, NULL, "Install" },
+ { "Also", NULL, 0, NULL, "Install" },
- { NULL, NULL, NULL, NULL }
+ { NULL, NULL, 0, NULL, NULL }
};
#undef EXEC_CONTEXT_CONFIG_ITEMS
FILE *f = NULL;
char *filename = NULL, *id = NULL;
Unit *merged;
+ struct stat st;
if (!u) {
/* Dirty dirty hack. */
goto finish;
}
- if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+ if (u->meta.manager->unit_path_cache &&
+ !set_get(u->meta.manager->unit_path_cache, filename))
+ r = -ENOENT;
+ else
+ r = open_follow(&filename, &f, symlink_names, &id);
+
+ if (r < 0) {
char *sn;
free(filename);
}
if (!filename) {
+ /* Hmm, no suitable file found? */
r = 0;
goto finish;
}
goto finish;
}
- /* Now, parse the file contents */
- if ((r = config_parse(filename, f, sections, items, false, u)) < 0)
+ zero(st);
+ if (fstat(fileno(f), &st) < 0) {
+ r = -errno;
goto finish;
+ }
+
+ if (null_or_empty(&st))
+ u->meta.load_state = UNIT_MASKED;
+ else {
+ /* Now, parse the file contents */
+ if ((r = config_parse(filename, f, sections, items, false, u)) < 0)
+ goto finish;
+
+ u->meta.load_state = UNIT_LOADED;
+ }
free(u->meta.fragment_path);
u->meta.fragment_path = filename;
filename = NULL;
- u->meta.load_state = UNIT_LOADED;
+ u->meta.fragment_mtime = timespec_load(&st.st_mtim);
+
r = 0;
finish:
int unit_load_fragment(Unit *u) {
int r;
+ Iterator i;
+ const char *t;
assert(u);
+ assert(u->meta.load_state == UNIT_STUB);
+ assert(u->meta.id);
- if (u->meta.fragment_path) {
+ /* First, try to find the unit under its id. We always look
+ * for unit files in the default directories, to make it easy
+ * to override things by placing things in /etc/systemd/system */
+ if ((r = load_from_path(u, u->meta.id)) < 0)
+ return r;
+
+ /* Try to find an alias we can load this with */
+ if (u->meta.load_state == UNIT_STUB)
+ SET_FOREACH(t, u->meta.names, i) {
+
+ if (t == u->meta.id)
+ continue;
+
+ if ((r = load_from_path(u, t)) < 0)
+ return r;
+
+ if (u->meta.load_state != UNIT_STUB)
+ break;
+ }
+
+ /* And now, try looking for it under the suggested (originally linked) path */
+ if (u->meta.load_state == UNIT_STUB && u->meta.fragment_path) {
if ((r = load_from_path(u, u->meta.fragment_path)) < 0)
return r;
- } else {
- Iterator i;
- const char *t;
+ if (u->meta.load_state == UNIT_STUB) {
+ /* Hmm, this didn't work? Then let's get rid
+ * of the fragment path stored for us, so that
+ * we don't point to an invalid location. */
+ free(u->meta.fragment_path);
+ u->meta.fragment_path = NULL;
+ }
+ }
+
+ /* Look for a template */
+ if (u->meta.load_state == UNIT_STUB && u->meta.instance) {
+ char *k;
+
+ if (!(k = unit_name_template(u->meta.id)))
+ return -ENOMEM;
- /* Try to find the unit under its id */
- if ((r = load_from_path(u, u->meta.id)) < 0)
+ r = load_from_path(u, k);
+ free(k);
+
+ if (r < 0)
return r;
- /* Try to find an alias we can load this with */
if (u->meta.load_state == UNIT_STUB)
SET_FOREACH(t, u->meta.names, i) {
if (t == u->meta.id)
continue;
- if ((r = load_from_path(u, t)) < 0)
+ if (!(k = unit_name_template(t)))
+ return -ENOMEM;
+
+ r = load_from_path(u, k);
+ free(k);
+
+ if (r < 0)
return r;
if (u->meta.load_state != UNIT_STUB)
break;
}
-
- /* Now, follow the same logic, but look for a template */
- if (u->meta.load_state == UNIT_STUB && u->meta.instance) {
- char *k;
-
- if (!(k = unit_name_template(u->meta.id)))
- return -ENOMEM;
-
- r = load_from_path(u, k);
- free(k);
-
- if (r < 0)
- return r;
-
- if (u->meta.load_state == UNIT_STUB)
- SET_FOREACH(t, u->meta.names, i) {
-
- if (t == u->meta.id)
- continue;
-
- if (!(k = unit_name_template(t)))
- return -ENOMEM;
-
- r = load_from_path(u, k);
- free(k);
-
- if (r < 0)
- return r;
-
- if (u->meta.load_state != UNIT_STUB)
- break;
- }
- }
}
return 0;