X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-fragment.c;h=f7d5382a73d7406264a9f6ec3f0f4bc3266b07be;hp=9eb00531c94e27d217c5b594e363151e9733d06f;hb=825636e5a88338436a1cd910319d020038389187;hpb=80876c20f64f87765242bc35895977ab6a855729 diff --git a/load-fragment.c b/load-fragment.c index 9eb00531c..f7d5382a7 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "unit.h" #include "strv.h" @@ -36,6 +37,34 @@ #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, @@ -56,25 +85,22 @@ static int config_parse_deps( assert(lvalue); assert(rvalue); - if (UNIT_VTABLE(u)->refuse_requires && - (d == UNIT_REQUIRES || - d == UNIT_SOFT_REQUIRES || - d == UNIT_REQUISITE || - d == UNIT_SOFT_REQUISITE)) { - log_error("[%s:%u] Dependency of type %s not acceptable for this unit type.", filename, line, lvalue); - return -EBADMSG; - } - FOREACH_WORD(w, l, rvalue, state) { - char *t; + 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, true); + free(k); + if (r < 0) return r; } @@ -102,15 +128,21 @@ static int config_parse_names( assert(data); FOREACH_WORD(w, l, rvalue, state) { - char *t; + char *t, *k; int r; if (!(t = strndup(w, l))) return -ENOMEM; - r = unit_merge_by_name(u, t); + k = unit_name_printf(u, t); free(t); + if (!k) + return -ENOMEM; + + r = unit_merge_by_name(u, k); + free(k); + if (r < 0) return r; } @@ -379,7 +411,6 @@ static int config_parse_usec( void *userdata) { usec_t *usec = data; - unsigned long long u; int r; assert(filename); @@ -387,73 +418,16 @@ static int config_parse_usec( assert(rvalue); assert(data); - if ((r = safe_atollu(rvalue, &u)) < 0) { + if ((r = parse_usec(rvalue, usec)) < 0) { log_error("[%s:%u] Failed to parse time value: %s", filename, line, rvalue); return r; } - /* We actually assume the user configures seconds. Later on we - * might choose to support suffixes for time values, to - * configure bigger or smaller units */ - - *usec = u * USEC_PER_SEC; - - return 0; -} - -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; - 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; -} +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 int config_parse_bindtodevice( const char *filename, @@ -484,57 +458,8 @@ static int config_parse_bindtodevice( return 0; } -static 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; -} - -static 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; - } - - *i = x; - - 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 int config_parse_facility( const char *filename, @@ -553,13 +478,10 @@ static int config_parse_facility( 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)); @@ -583,13 +505,10 @@ static int config_parse_level( 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; @@ -612,13 +531,10 @@ static int config_parse_io_class( 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; @@ -672,13 +588,10 @@ static int config_parse_cpu_sched_policy( 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; @@ -988,7 +901,9 @@ static int config_parse_sysv_priority( return 0; } -static int config_parse_kill_mode( +DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); + +static int config_parse_mount_flags( const char *filename, unsigned line, const char *section, @@ -997,26 +912,37 @@ static int config_parse_kill_mode( void *data, void *userdata) { - KillMode *m = data, x; + ExecContext *c = data; + char *w; + size_t l; + char *state; + unsigned long flags = 0; assert(filename); assert(lvalue); assert(rvalue); assert(data); - if ((x = kill_mode_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse kill mode specifier: %s", filename, line, rvalue); - return -EBADMSG; + FOREACH_WORD(w, l, rvalue, state) { + if (strncmp(w, "shared", l) == 0) + flags |= MS_SHARED; + else if (strncmp(w, "slave", l) == 0) + flags |= MS_SLAVE; + else if (strncmp(w, "private", l) == 0) + flags |= MS_PRIVATE; + else { + log_error("[%s:%u] Failed to parse mount flags: %s", filename, line, rvalue); + return -EINVAL; + } } - *m = x; - + c->mount_flags = flags; return 0; } #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; @@ -1075,12 +1001,12 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { 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; } @@ -1168,7 +1094,10 @@ static void dump_items(FILE *f, const ConfigItem *items) { { config_parse_kill_mode, "KILLMODE" }, { config_parse_listen, "SOCKET [...]" }, { config_parse_socket_bind, "SOCKETBIND" }, - { config_parse_bindtodevice, "NETWORKINTERFACE" } + { config_parse_bindtodevice, "NETWORKINTERFACE" }, + { config_parse_usec, "SECONDS" }, + { config_parse_path_strv, "PATH [...]" }, + { config_parse_mount_flags, "MOUNTFLAG [...]" } }; assert(f); @@ -1254,21 +1183,26 @@ static int load_from_path(Unit *u, const char *path) { { "LimitNICE", config_parse_limit, &(context).rlimit[RLIMIT_NICE], section }, \ { "LimitRTPRIO", config_parse_limit, &(context).rlimit[RLIMIT_RTPRIO], section }, \ { "LimitRTTIME", config_parse_limit, &(context).rlimit[RLIMIT_RTTIME], section }, \ - { "ControlGroup", config_parse_cgroup, u, section } + { "ControlGroup", config_parse_cgroup, u, section }, \ + { "ReadWriteDirectories", config_parse_path_strv, &(context).read_write_dirs, section }, \ + { "ReadOnlyDirectories", config_parse_path_strv, &(context).read_only_dirs, section }, \ + { "InaccessibleDirectories",config_parse_path_strv, &(context).inaccessible_dirs, section }, \ + { "PrivateTmp", config_parse_bool, &(context).private_tmp, section }, \ + { "MountFlags", config_parse_mount_flags, &(context), section } const ConfigItem items[] = { - { "Names", config_parse_names, u, "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" }, @@ -1279,14 +1213,15 @@ static int load_from_path(Unit *u, const char *path) { { "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" }, @@ -1304,6 +1239,7 @@ static int load_from_path(Unit *u, const char *path) { { "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"), { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" }, @@ -1314,6 +1250,8 @@ static int load_from_path(Unit *u, const char *path) { { "KillMode", config_parse_kill_mode, &u->mount.kill_mode, "Mount" }, EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"), + { "Where", config_parse_path, &u->automount.where, "Automount" }, + { NULL, NULL, NULL, NULL } }; @@ -1336,7 +1274,7 @@ static int load_from_path(Unit *u, const char *path) { assert(u); assert(path); - sections[0] = "Meta"; + sections[0] = "Unit"; sections[1] = section_table[u->meta.type]; sections[2] = NULL; @@ -1445,15 +1383,14 @@ int unit_load_fragment(Unit *u) { const char *t; /* Try to find the unit under its id */ - if ((t = unit_id(u))) - if ((r = load_from_path(u, t)) < 0) - return r; + 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 (unit_id(u) == t) + if (t == u->meta.id) continue; if ((r = load_from_path(u, t)) < 0) @@ -1462,6 +1399,39 @@ int unit_load_fragment(Unit *u) { 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;