/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
#include <linux/oom.h>
#include <assert.h>
#include <errno.h>
#include "ioprio.h"
#include "securebits.h"
#include "missing.h"
+#include "unit-name.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; \
+ }
static int config_parse_deps(
const char *filename,
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, &l, rvalue, state) {
- char *t;
+ FOREACH_WORD(w, l, rvalue, state) {
+ char *t, *k;
int r;
if (!(t = strndup(w, l)))
return -ENOMEM;
- r = unit_add_dependency_by_name(u, d, t);
+ k = unit_name_printf(u, t);
free(t);
+ if (!k)
+ return -ENOMEM;
+
+ r = unit_add_dependency_by_name(u, d, k, NULL);
+ free(k);
+
if (r < 0)
return r;
}
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
- char *t;
+ FOREACH_WORD(w, l, rvalue, state) {
+ char *t, *k;
int r;
- Unit *other;
if (!(t = strndup(w, l)))
return -ENOMEM;
- other = manager_get_unit(u->meta.manager, t);
-
- if (other) {
-
- if (other != u) {
-
- if (other->meta.load_state != UNIT_STUB) {
- free(t);
- return -EEXIST;
- }
+ k = unit_name_printf(u, t);
+ free(t);
- if ((r = unit_merge(u, other)) < 0) {
- free(t);
- return r;
- }
- }
+ if (!k)
+ return -ENOMEM;
- } else {
- if ((r = unit_add_name(u, t)) < 0) {
- free(t);
- return r;
- }
- }
+ r = unit_merge_by_name(u, k);
+ free(k);
- free(t);
+ if (r < 0)
+ return r;
}
return 0;
return 0;
}
-static int config_parse_umask(
+static int config_parse_mode(
const char *filename,
unsigned line,
const char *section,
errno = 0;
l = strtol(rvalue, &x, 8);
if (!x || *x || errno) {
- log_error("[%s:%u] Failed to parse umask value: %s", filename, line, rvalue);
+ log_error("[%s:%u] Failed to parse mode value: %s", filename, line, rvalue);
return errno ? -errno : -EINVAL;
}
- if (l < 0000 || l > 0777) {
- log_error("[%s:%u] umask value out of range: %s", filename, line, rvalue);
+ if (l < 0000 || l > 07777) {
+ log_error("[%s:%u] mode value out of range: %s", filename, line, rvalue);
return -ERANGE;
}
void *data,
void *userdata) {
- ExecCommand **e = data, *ee, *nce = NULL;
+ ExecCommand **e = data, *nce = NULL;
char **n;
char *w;
unsigned k;
if (!(nce->path = strdup(n[0])))
goto fail;
- if (*e) {
- /* It's kinda important that we keep the order here */
- LIST_FIND_TAIL(ExecCommand, command, *e, ee);
- LIST_INSERT_AFTER(ExecCommand, command, *e, ee, nce);
- } else
- *e = nce;
+ exec_command_append_list(e, nce);
return 0;
return 0;
}
-static int config_parse_service_type(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- Service *s = data;
- ServiceType x;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- if ((x = service_type_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse service type: %s", filename, line, rvalue);
- return -EBADMSG;
- }
-
- s->type = x;
+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");
- return 0;
-}
-
-static int config_parse_service_restart(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- Service *s = data;
- ServiceRestart x;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- if ((x = service_restart_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse service restart specifier: %s", filename, line, rvalue);
- return -EBADMSG;
- }
-
- s->restart = x;
-
- return 0;
-}
-
-int config_parse_bindtodevice(
+static int config_parse_bindtodevice(
const char *filename,
unsigned line,
const char *section,
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, x;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- if ((x = exec_output_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse output specifier: %s", filename, line, rvalue);
- return -EBADMSG;
- }
-
- *o = x;
-
- return 0;
-}
-
-int config_parse_input(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- ExecInput *i = data, x;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- if ((x = exec_input_from_string(rvalue)) < 0) {
- log_error("[%s:%u] Failed to parse input specifier: %s", filename, line, rvalue);
- return -EBADMSG;
- }
+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");
- *i = x;
-
- return 0;
-}
-
-int config_parse_facility(
+static int config_parse_facility(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- if ((x = log_facility_from_string(rvalue)) < 0)
-
- /* Second try, let's see if this is a number. */
- if (safe_atoi(rvalue, &x) < 0 || !log_facility_to_string(x)) {
- log_error("[%s:%u] Failed to parse log facility: %s", filename, line, rvalue);
- return -EBADMSG;
- }
+ if ((x = log_facility_from_string(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse log facility: %s", filename, line, rvalue);
+ return -EBADMSG;
+ }
*o = LOG_MAKEPRI(x, LOG_PRI(*o));
return 0;
}
-int config_parse_level(
+static int config_parse_level(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- if ((x = log_level_from_string(rvalue)) < 0)
-
- /* Second try, let's see if this is a number. */
- if (safe_atoi(rvalue, &x) < 0 || !log_level_to_string(x)) {
- log_error("[%s:%u] Failed to parse log level: %s", filename, line, rvalue);
- return -EBADMSG;
- }
+ if ((x = log_level_from_string(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse log level: %s", filename, line, rvalue);
+ return -EBADMSG;
+ }
*o = LOG_MAKEPRI(LOG_FAC(*o), x);
return 0;
}
-int config_parse_io_class(
+static int config_parse_io_class(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- if ((x = ioprio_class_from_string(rvalue)) < 0)
-
- /* Second try, let's see if this is a number. */
- if (safe_atoi(rvalue, &x) < 0 || !ioprio_class_to_string(x)) {
- log_error("[%s:%u] Failed to parse IO scheduling class: %s", filename, line, rvalue);
- return -EBADMSG;
- }
+ if ((x = ioprio_class_from_string(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse IO scheduling class: %s", filename, line, rvalue);
+ return -EBADMSG;
+ }
c->ioprio = IOPRIO_PRIO_VALUE(x, IOPRIO_PRIO_DATA(c->ioprio));
c->ioprio_set = true;
return 0;
}
-int config_parse_io_priority(
+static int config_parse_io_priority(
const char *filename,
unsigned line,
const char *section,
return 0;
}
-int config_parse_cpu_sched_policy(
+static int config_parse_cpu_sched_policy(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- if ((x = sched_policy_from_string(rvalue)) < 0)
-
- /* Second try, let's see if this is a number. */
- if (safe_atoi(rvalue, &x) < 0 || !sched_policy_to_string(x)) {
- log_error("[%s:%u] Failed to parse CPU scheduling policy: %s", filename, line, rvalue);
- return -EBADMSG;
- }
+ if ((x = sched_policy_from_string(rvalue)) < 0) {
+ log_error("[%s:%u] Failed to parse CPU scheduling policy: %s", filename, line, rvalue);
+ return -EBADMSG;
+ }
c->cpu_sched_policy = x;
c->cpu_sched_set = true;
return 0;
}
-int config_parse_cpu_sched_prio(
+static int config_parse_cpu_sched_prio(
const char *filename,
unsigned line,
const char *section,
return 0;
}
-int config_parse_cpu_affinity(
+static int config_parse_cpu_affinity(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
return 0;
}
-int config_parse_capabilities(
+static int config_parse_capabilities(
const char *filename,
unsigned line,
const char *section,
return 0;
}
-int config_parse_secure_bits(
+static int config_parse_secure_bits(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
return 0;
}
-int config_parse_bounding_set(
+static int config_parse_bounding_set(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;
return 0;
}
+static int config_parse_cgroup(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Unit *u = userdata;
+ char *w;
+ size_t l;
+ char *state;
+
+ FOREACH_WORD(w, l, rvalue, state) {
+ char *t;
+ int r;
+
+ if (!(t = strndup(w, l)))
+ return -ENOMEM;
+
+ r = unit_add_cgroup_from_text(u, t);
+ free(t);
+
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+static int config_parse_sysv_priority(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ int *priority = data;
+ int r, 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;
+ }
+
+ *priority = (int) i;
+ return 0;
+}
+
+DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+
#define FOLLOW_MAX 8
-static int open_follow(char **filename, FILE **_f, Set *names, char **_id) {
+static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
unsigned c = 0;
int fd, r;
FILE *f;
if (!(f = fdopen(fd, "r"))) {
r = -errno;
- assert(close_nointr(fd) == 0);
+ close_nointr_nofail(fd);
return r;
}
*_f = f;
- *_id = id;
+ *_final = id;
return 0;
}
+static int merge_by_names(Unit **u, Set *names, const char *id) {
+ char *k;
+ int r;
+
+ assert(u);
+ assert(*u);
+ assert(names);
+
+ /* Let's try to add in all symlink names we found */
+ while ((k = set_steal_first(names))) {
+
+ /* First try to merge in the other name into our
+ * unit */
+ if ((r = unit_merge_by_name(*u, k)) < 0) {
+ Unit *other;
+
+ /* Hmm, we couldn't merge the other unit into
+ * ours? Then let's try it the other way
+ * round */
+
+ other = manager_get_unit((*u)->meta.manager, k);
+ free(k);
+
+ if (other)
+ if ((r = unit_merge(other, *u)) >= 0) {
+ *u = other;
+ return merge_by_names(u, names, NULL);
+ }
+
+ return r;
+ }
+
+ if (id == k)
+ unit_choose_id(*u, id);
+
+ free(k);
+ }
+
+ return 0;
+}
+
+static void dump_items(FILE *f, const ConfigItem *items) {
+ const ConfigItem *i;
+ const char *prev_section = NULL;
+ bool not_first = false;
+
+ struct {
+ ConfigParserCallback callback;
+ const char *rvalue;
+ } table[] = {
+ { config_parse_int, "INTEGER" },
+ { config_parse_unsigned, "UNSIGNED" },
+ { config_parse_size, "SIZE" },
+ { config_parse_bool, "BOOLEAN" },
+ { config_parse_string, "STRING" },
+ { config_parse_path, "PATH" },
+ { config_parse_strv, "STRING [...]" },
+ { config_parse_nice, "NICE" },
+ { config_parse_oom_adjust, "OOMADJUST" },
+ { 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_output, "OUTPUT" },
+ { config_parse_input, "INPUT" },
+ { config_parse_facility, "FACILITY" },
+ { config_parse_level, "LEVEL" },
+ { config_parse_capabilities, "CAPABILITIES" },
+ { config_parse_secure_bits, "SECUREBITS" },
+ { config_parse_bounding_set, "BOUNDINGSET" },
+ { config_parse_timer_slack_ns, "TIMERSLACK" },
+ { config_parse_limit, "LIMIT" },
+ { config_parse_cgroup, "CGROUP [...]" },
+ { config_parse_deps, "UNIT [...]" },
+ { config_parse_names, "UNIT [...]" },
+ { config_parse_exec, "PATH [ARGUMENT [...]]" },
+ { config_parse_service_type, "SERVICETYPE" },
+ { config_parse_service_restart, "SERVICERESTART" },
+ { config_parse_sysv_priority, "SYSVPRIORITY" },
+ { config_parse_kill_mode, "KILLMODE" },
+ { config_parse_listen, "SOCKET [...]" },
+ { config_parse_socket_bind, "SOCKETBIND" },
+ { config_parse_bindtodevice, "NETWORKINTERFACE" }
+ };
+
+ assert(f);
+ assert(items);
+
+ for (i = items; i->lvalue; i++) {
+ unsigned j;
+ const char *rvalue = "OTHER";
+
+ if (!streq_ptr(i->section, prev_section)) {
+ if (!not_first)
+ not_first = true;
+ else
+ fputc('\n', f);
+
+ fprintf(f, "[%s]\n", i->section);
+ prev_section = i->section;
+ }
+
+ for (j = 0; j < ELEMENTSOF(table); j++)
+ if (i->parse == table[j].callback) {
+ rvalue = table[j].rvalue;
+ break;
+ }
+
+ fprintf(f, "%s=%s\n", i->lvalue, rvalue);
+ }
+}
+
static int load_from_path(Unit *u, const char *path) {
static const char* const section_table[_UNIT_TYPE_MAX] = {
{ "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_umask, &(context).umask, section }, \
+ { "UMask", config_parse_mode, &(context).umask, section }, \
{ "Environment", config_parse_strv, &(context).environment, section }, \
- { "Output", config_parse_output, &(context).output, section }, \
- { "Input", config_parse_input, &(context).input, section }, \
+ { "StandardInput", config_parse_input, &(context).std_input, section }, \
+ { "StandardOutput", config_parse_output, &(context).std_output, section }, \
+ { "StandardError", config_parse_output, &(context).std_output, 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 }, \
{ "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 }
+ { "LimitRTTIME", config_parse_limit, &(context).rlimit[RLIMIT_RTTIME], section }, \
+ { "ControlGroup", config_parse_cgroup, u, section }
const ConfigItem items[] = {
- { "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" },
+ { "Names", config_parse_names, u, "Unit" },
+ { "Description", config_parse_string, &u->meta.description, "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" },
{ "PIDFile", config_parse_path, &u->service.pid_file, "Service" },
{ "ExecStartPre", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START_PRE, "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" },
+ { "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" },
EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"),
{ "ListenStream", config_parse_listen, &u->socket, "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" },
EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"),
- EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"),
+ { "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" },
+ EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"),
{ NULL, NULL, NULL, NULL }
};
char *k;
int r;
Set *symlink_names;
- FILE *f;
- char *filename, *id;
+ FILE *f = NULL;
+ char *filename = NULL, *id = NULL;
+ Unit *merged;
+
+ if (!u) {
+ /* Dirty dirty hack. */
+ dump_items((FILE*) path, items);
+ return 0;
+ }
+
+ assert(u);
+ assert(path);
- sections[0] = "Meta";
+ sections[0] = "Unit";
sections[1] = section_table[u->meta.type];
sections[2] = NULL;
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 (path_is_absolute(path)) {
- if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
- if (r == -ENOENT)
- r = 0; /* returning 0 means: no suitable config file found */
+ if (!(filename = strdup(path))) {
+ r = -ENOMEM;
+ goto finish;
+ }
- goto finish;
+ if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+ free(filename);
+ filename = NULL;
+
+ if (r != -ENOENT)
+ goto finish;
+ }
+
+ } else {
+ char **p;
+
+ STRV_FOREACH(p, u->meta.manager->unit_path) {
+
+ /* 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, *p))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+ char *sn;
+
+ free(filename);
+ filename = NULL;
+
+ if (r != -ENOENT)
+ goto finish;
+
+ /* Empty the symlink names for the next run */
+ while ((sn = set_steal_first(symlink_names)))
+ free(sn);
+
+ continue;
+ }
+
+ break;
+ }
}
- /* Now, parse the file contents */
- r = config_parse(filename, f, sections, items, u);
- if (r < 0)
+ if (!filename) {
+ 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;
-
+ merged = u;
+ if ((r = merge_by_names(&merged, symlink_names, id)) < 0)
+ goto finish;
- if (id == k)
- unit_choose_id(u, id);
- free(k);
+ if (merged != u) {
+ u->meta.load_state = UNIT_MERGED;
+ r = 0;
+ goto finish;
}
+ /* Now, parse the file contents */
+ if ((r = config_parse(filename, f, sections, items, u)) < 0)
+ goto finish;
- free(u->meta.load_path);
- u->meta.load_path = filename;
+ free(u->meta.fragment_path);
+ u->meta.fragment_path = filename;
filename = NULL;
- r = 1; /* returning 1 means: suitable config file found and loaded */
+ u->meta.load_state = UNIT_LOADED;
+ r = 0;
finish:
while ((k = set_steal_first(symlink_names)))
free(k);
+
set_free(symlink_names);
free(filename);
+ if (f)
+ fclose(f);
+
return r;
}
int unit_load_fragment(Unit *u) {
- int r = 0;
- ExecContext *c;
+ int r;
assert(u);
- assert(u->meta.load_state == UNIT_STUB);
- if (u->meta.load_path)
- r = load_from_path(u, u->meta.load_path);
- else {
+ if (u->meta.fragment_path) {
+
+ if ((r = load_from_path(u, u->meta.fragment_path)) < 0)
+ return r;
+
+ } else {
Iterator i;
- char *t;
+ const char *t;
+
+ /* Try to find the unit under its id */
+ 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;
- /* Try to find a name we can load this with */
- SET_FOREACH(t, u->meta.names, i)
- if ((r = load_from_path(u, t)) != 0)
+ if ((r = load_from_path(u, t)) < 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.type == UNIT_SOCKET)
- c = &u->socket.exec_context;
- else if (u->meta.type == UNIT_SERVICE)
- c = &u->service.exec_context;
- else
- c = NULL;
+ if (u->meta.load_state == UNIT_STUB)
+ SET_FOREACH(t, u->meta.names, i) {
- if (r >= 0 && c &&
- (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG)) {
- int k;
+ if (t == u->meta.id)
+ continue;
- /* If syslog or kernel logging is requested, make sure
- * our own logging daemon is run first. */
+ if (!(k = unit_name_template(t)))
+ return -ENOMEM;
- if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0)
- return k;
+ r = load_from_path(u, k);
+ free(k);
- if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0)
- return k;
+ if (r < 0)
+ return r;
+
+ if (u->meta.load_state != UNIT_STUB)
+ break;
+ }
+ }
}
- return r;
+ return 0;
+}
+
+void unit_dump_config_items(FILE *f) {
+ /* OK, this wins a prize for extreme ugliness. */
+
+ load_from_path(NULL, (const void*) f);
}
~ianmdlvl / elogind.git / blobdiff