X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-fragment.c;h=bd84e8fe79b86fdf181ba146c60b7d5174c141bb;hp=c271ce5a5cc2f930f65fe1a5bff0ebf297fafb5a;hb=ee2b489421ce8b47c08fb42c598c5af47043a9f9;hpb=0acb83e9e63206af9a2c6a35ca054453d235458a
diff --git a/load-fragment.c b/load-fragment.c
index c271ce5a5..bd84e8fe7 100644
--- a/load-fragment.c
+++ b/load-fragment.c
@@ -1,5 +1,24 @@
/*-*- 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 .
+***/
+
#include
#include
#include
@@ -37,7 +56,7 @@ static int config_parse_deps(
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
@@ -73,39 +92,18 @@ static int config_parse_names(
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
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;
- }
-
- if ((r = unit_merge(u, other)) < 0) {
- free(t);
- return r;
- }
- }
-
- } else {
- if ((r = unit_add_name(u, t)) < 0) {
- free(t);
- return r;
- }
- }
-
+ r = unit_merge_by_name(u, t);
free(t);
+
+ if (r < 0)
+ return r;
}
return 0;
@@ -266,7 +264,7 @@ static int config_parse_oom_adjust(
return 0;
}
-static int config_parse_umask(
+static int config_parse_mode(
const char *filename,
unsigned line,
const char *section,
@@ -287,12 +285,12 @@ static int config_parse_umask(
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;
}
@@ -309,7 +307,7 @@ static int config_parse_exec(
void *data,
void *userdata) {
- ExecCommand **e = data, *ee, *nce = NULL;
+ ExecCommand **e = data, *nce = NULL;
char **n;
char *w;
unsigned k;
@@ -348,12 +346,7 @@ static int config_parse_exec(
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;
@@ -453,7 +446,7 @@ static int config_parse_service_restart(
return 0;
}
-int config_parse_bindtodevice(
+static int config_parse_bindtodevice(
const char *filename,
unsigned line,
const char *section,
@@ -482,7 +475,7 @@ int config_parse_bindtodevice(
return 0;
}
-int config_parse_output(
+static int config_parse_output(
const char *filename,
unsigned line,
const char *section,
@@ -508,7 +501,7 @@ int config_parse_output(
return 0;
}
-int config_parse_input(
+static int config_parse_input(
const char *filename,
unsigned line,
const char *section,
@@ -534,7 +527,7 @@ int config_parse_input(
return 0;
}
-int config_parse_facility(
+static int config_parse_facility(
const char *filename,
unsigned line,
const char *section,
@@ -564,7 +557,7 @@ int config_parse_facility(
return 0;
}
-int config_parse_level(
+static int config_parse_level(
const char *filename,
unsigned line,
const char *section,
@@ -593,7 +586,7 @@ int config_parse_level(
return 0;
}
-int config_parse_io_class(
+static int config_parse_io_class(
const char *filename,
unsigned line,
const char *section,
@@ -624,7 +617,7 @@ int config_parse_io_class(
return 0;
}
-int config_parse_io_priority(
+static int config_parse_io_priority(
const char *filename,
unsigned line,
const char *section,
@@ -652,7 +645,7 @@ int config_parse_io_priority(
return 0;
}
-int config_parse_cpu_sched_policy(
+static int config_parse_cpu_sched_policy(
const char *filename,
unsigned line,
const char *section,
@@ -684,7 +677,7 @@ int config_parse_cpu_sched_policy(
return 0;
}
-int config_parse_cpu_sched_prio(
+static int config_parse_cpu_sched_prio(
const char *filename,
unsigned line,
const char *section,
@@ -713,7 +706,7 @@ int config_parse_cpu_sched_prio(
return 0;
}
-int config_parse_cpu_affinity(
+static int config_parse_cpu_affinity(
const char *filename,
unsigned line,
const char *section,
@@ -732,7 +725,7 @@ int config_parse_cpu_affinity(
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
@@ -756,7 +749,7 @@ int config_parse_cpu_affinity(
return 0;
}
-int config_parse_capabilities(
+static int config_parse_capabilities(
const char *filename,
unsigned line,
const char *section,
@@ -788,7 +781,7 @@ int config_parse_capabilities(
return 0;
}
-int config_parse_secure_bits(
+static int config_parse_secure_bits(
const char *filename,
unsigned line,
const char *section,
@@ -807,7 +800,7 @@ int config_parse_secure_bits(
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"))
@@ -829,7 +822,7 @@ int config_parse_secure_bits(
return 0;
}
-int config_parse_bounding_set(
+static int config_parse_bounding_set(
const char *filename,
unsigned line,
const char *section,
@@ -848,7 +841,7 @@ int config_parse_bounding_set(
assert(rvalue);
assert(data);
- FOREACH_WORD(w, &l, rvalue, state) {
+ FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;
@@ -929,6 +922,63 @@ static int config_parse_limit(
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 FOLLOW_MAX 8
static int open_follow(char **filename, FILE **_f, Set *names, char **_id) {
@@ -999,7 +1049,48 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_id) {
return 0;
}
-static int load_from_path(Unit *u, const char *path) {
+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 int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) {
static const char* const section_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "Service",
@@ -1026,7 +1117,7 @@ static int load_from_path(Unit *u, const char *path) {
{ "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 }, \
@@ -1052,7 +1143,10 @@ static int load_from_path(Unit *u, const char *path) {
{ "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 }, \
+ { "NonBlocking", config_parse_bool, &(context).non_blocking, section }, \
+ { "ControlGroup", config_parse_cgroup, u, section }, \
+ { "NewSession", config_parse_bool, &(context).new_session, section }
const ConfigItem items[] = {
{ "Names", config_parse_names, u, "Meta" },
@@ -1079,6 +1173,10 @@ static int load_from_path(Unit *u, const char *path) {
{ "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" },
+ { "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" },
EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"),
{ "ListenStream", config_parse_listen, &u->socket, "Socket" },
@@ -1092,6 +1190,8 @@ static int load_from_path(Unit *u, const char *path) {
{ "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" },
+ { "DirectoryMode", config_parse_mode, &u->socket.directory_mode, "Socket" },
+ { "SocketMode", config_parse_mode, &u->socket.socket_mode, "Socket" },
EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"),
EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"),
@@ -1105,8 +1205,12 @@ static int load_from_path(Unit *u, const char *path) {
char *k;
int r;
Set *symlink_names;
- FILE *f;
- char *filename, *id;
+ FILE *f = NULL;
+ char *filename = NULL, *id = NULL;
+ Unit *merged;
+
+ assert(u);
+ assert(new_state);
sections[0] = "Meta";
sections[1] = section_table[u->meta.type];
@@ -1115,92 +1219,128 @@ static int load_from_path(Unit *u, const char *path) {
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) {
+ *new_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 */
+ *new_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 unit_load_fragment(Unit *u, UnitLoadState *new_state) {
+ int r;
assert(u);
- assert(u->meta.load_state == UNIT_STUB);
+ assert(new_state);
+ assert(*new_state == UNIT_STUB);
+
+ if (u->meta.fragment_path) {
+
+ if ((r = load_from_path(u, u->meta.fragment_path, new_state)) < 0)
+ return r;
- if (u->meta.load_path)
- r = load_from_path(u, u->meta.load_path);
- else {
+ } else {
Iterator i;
- char *t;
+ const char *t;
- /* 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)
+ /* Try to find the unit under its id */
+ if ((t = unit_id(u)))
+ if ((r = load_from_path(u, t, new_state)) < 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 (r >= 0 && c &&
- (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG)) {
- int k;
+ /* Try to find an alias we can load this with */
+ if (*new_state == UNIT_STUB)
+ SET_FOREACH(t, u->meta.names, i) {
- /* If syslog or kernel logging is requested, make sure
- * our own logging daemon is run first. */
+ if (unit_id(u) == t)
+ continue;
- if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0)
- return k;
+ if ((r = load_from_path(u, t, new_state)) < 0)
+ return r;
- if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0)
- return k;
+ if (*new_state != UNIT_STUB)
+ break;
+ }
}
- return r;
+ return 0;
}