X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fload-fragment.c;h=740c11c3c2f3649d894bef523207c1cd0fd2df47;hp=1d40b69c98ad538d07128ac9391a88bf03cc1a05;hb=b9c0d4415b8cd6135321185b6febfdd1366a477c;hpb=b708e7cea941538bfd5e20ce0a723c19b7da7d1d diff --git a/src/load-fragment.c b/src/load-fragment.c index 1d40b69c9..740c11c3c 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -29,6 +29,7 @@ #include #include #include +#include #include "unit.h" #include "strv.h" @@ -41,7 +42,20 @@ #include "unit-name.h" #include "bus-errors.h" -#define COMMENTS "#;\n" +#ifndef HAVE_SYSV_COMPAT +static int config_parse_warn_compat( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + 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, @@ -76,10 +90,14 @@ static int config_parse_deps( 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; @@ -118,10 +136,14 @@ static int config_parse_names( 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; @@ -196,9 +218,9 @@ static int config_parse_listen( p->type = SOCKET_SOCKET; if ((r = socket_address_parse(&p->address, rvalue)) < 0) { - log_error("[%s:%u] Failed to parse address value: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue); free(p); - return r; + return 0; } if (streq(lvalue, "ListenStream")) @@ -211,8 +233,9 @@ static int config_parse_listen( } 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; } } @@ -245,8 +268,8 @@ static int config_parse_socket_bind( 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; @@ -274,13 +297,13 @@ static int config_parse_nice( assert(data); if ((r = safe_atoi(rvalue, &priority)) < 0) { - log_error("[%s:%u] Failed to parse nice priority: %s", filename, line, rvalue); - return r; + 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; @@ -289,7 +312,7 @@ static int config_parse_nice( return 0; } -static int config_parse_oom_adjust( +static int config_parse_oom_score_adjust( const char *filename, unsigned line, const char *section, @@ -307,17 +330,17 @@ static int config_parse_oom_adjust( 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; + 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; } @@ -343,13 +366,13 @@ static int config_parse_mode( 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; @@ -404,8 +427,8 @@ static int config_parse_exec( } if (*rvalue != '/') { - log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue); - return -EINVAL; + log_error("[%s:%u] Invalid executable path in command line, ignoring: %s", filename, line, rvalue); + return 0; } k = 0; @@ -437,9 +460,9 @@ static int config_parse_exec( n[k] = NULL; if (!n[0]) { - log_error("[%s:%u] Invalid command line: %s", filename, line, rvalue); + log_error("[%s:%u] Invalid command line, ignoring: %s", filename, line, rvalue); strv_free(n); - return -EINVAL; + return 0; } if (!path) @@ -491,8 +514,8 @@ static int config_parse_usec( assert(data); if ((r = parse_usec(rvalue, usec)) < 0) { - log_error("[%s:%u] Failed to parse time value: %s", filename, line, rvalue); - return r; + log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue); + return 0; } return 0; @@ -551,8 +574,8 @@ static int config_parse_facility( 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; + log_error("[%s:%u] Failed to parse log facility, ignoring: %s", filename, line, rvalue); + return 0; } *o = LOG_MAKEPRI(x, LOG_PRI(*o)); @@ -578,8 +601,8 @@ static int config_parse_level( 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); @@ -604,8 +627,8 @@ static int config_parse_io_class( 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)); @@ -632,8 +655,8 @@ static int config_parse_io_priority( 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); @@ -661,8 +684,8 @@ static int config_parse_cpu_sched_policy( 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; @@ -690,8 +713,8 @@ static int config_parse_cpu_sched_prio( /* 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; @@ -735,8 +758,8 @@ static int config_parse_cpu_affinity( return -ENOMEM; if (r < 0 || cpu >= c->cpuset_ncpus) { - log_error("[%s:%u] Failed to parse CPU affinity: %s", filename, line, rvalue); - return -EBADMSG; + log_error("[%s:%u] Failed to parse CPU affinity, ignoring: %s", filename, line, rvalue); + return 0; } CPU_SET_S(cpu, CPU_ALLOC_SIZE(c->cpuset_ncpus), c->cpuset); @@ -766,8 +789,8 @@ static int config_parse_capabilities( 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) @@ -810,8 +833,8 @@ static int config_parse_secure_bits( 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; } } @@ -849,8 +872,8 @@ static int config_parse_bounding_set( 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; @@ -878,8 +901,8 @@ static int config_parse_timer_slack_nsec( 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; + log_error("[%s:%u] Failed to parse time slack value, ignoring: %s", filename, line, rvalue); + return 0; } c->timer_slack_nsec = u; @@ -906,8 +929,8 @@ static int config_parse_limit( assert(data); if ((r = safe_atollu(rvalue, &u)) < 0) { - log_error("[%s:%u] Failed to parse resource value: %s", filename, line, rvalue); - return r; + log_error("[%s:%u] Failed to parse resource value, ignoring: %s", filename, line, rvalue); + return 0; } if (!*rl) @@ -942,13 +965,16 @@ static int config_parse_cgroup( 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, @@ -967,13 +993,14 @@ static int config_parse_sysv_priority( 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; + log_error("[%s:%u] Failed to parse SysV start priority, ignoring: %s", filename, line, rvalue); + return 0; } *priority = (int) i; return 0; } +#endif static DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); @@ -999,8 +1026,8 @@ static int config_parse_kill_signal( r = signal_from_string(rvalue+3); if (r <= 0) { - log_error("[%s:%u] Failed to parse kill signal: %s", filename, line, rvalue); - return -EINVAL; + log_error("[%s:%u] Failed to parse kill signal, ignoring: %s", filename, line, rvalue); + return 0; } *sig = r; @@ -1035,8 +1062,8 @@ static int config_parse_mount_flags( 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; + log_error("[%s:%u] Failed to parse mount flags, ignoring: %s", filename, line, rvalue); + return 0; } } @@ -1065,13 +1092,13 @@ static int config_parse_timer( 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; + log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue); + return 0; } if (!(v = new0(TimerValue, 1))) @@ -1106,14 +1133,14 @@ static int config_parse_timer_unit( dbus_error_init(&error); if (endswith(rvalue, ".timer")) { - log_error("[%s:%u] Unit cannot be of type timer: %s", filename, line, rvalue); - return -EINVAL; + 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, NULL, &t->unit)) < 0) { - log_error("[%s:%u] Failed to load unit %s: %s", filename, line, rvalue, bus_error(&error, r)); + log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r)); dbus_error_free(&error); - return r; + return 0; } return 0; @@ -1138,13 +1165,13 @@ static int config_parse_path_spec( 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))) @@ -1186,14 +1213,102 @@ static int config_parse_path_unit( 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, &error, &t->unit)) < 0) { - log_error("[%s:%u] Failed to load unit %s: %s", filename, line, rvalue, bus_error(&error, r)); + log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r)); dbus_error_free(&error); - return r; + return 0; + } + + return 0; +} + +static int config_parse_socket_service( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + 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, + 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; @@ -1218,8 +1333,8 @@ static int config_parse_env_file( assert(data); if (!(f = fopen(rvalue, "re"))) { - log_error("[%s:%u] Failed to open environment file '%s': %m", filename, line, rvalue); - return -errno; + log_error("[%s:%u] Failed to open environment file '%s', ignoring: %m", filename, line, rvalue); + return 0; } while (!feof(f)) { @@ -1231,7 +1346,8 @@ static int config_parse_env_file( break; r = -errno; - log_error("[%s:%u] Failed to read environment file '%s': %m", filename, line, rvalue); + log_error("[%s:%u] Failed to read environment file '%s', ignoring: %m", filename, line, rvalue); + r = 0; goto finish; } @@ -1276,8 +1392,8 @@ static int config_parse_ip_tos( if ((x = ip_tos_from_string(rvalue)) < 0) if ((r = safe_atoi(rvalue, &x)) < 0) { - log_error("[%s:%u] Failed to parse IP TOS value: %s", filename, line, rvalue); - return r; + log_error("[%s:%u] Failed to parse IP TOS value, ignoring: %s", filename, line, rvalue); + return 0; } *ip_tos = x; @@ -1311,16 +1427,20 @@ 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, false)) { + if (!(id = set_get(names, name))) { - if ((r = set_put(names, id)) < 0) { - free(id); - return r; + if (!(id = strdup(name))) + return -ENOMEM; + + if ((r = set_put(names, id)) < 0) { + free(id); + return r; + } } } @@ -1339,7 +1459,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { *filename = target; } - if (!(f = fdopen(fd, "r"))) { + if (!(f = fdopen(fd, "re"))) { r = -errno; close_nointr_nofail(fd); return r; @@ -1408,7 +1528,7 @@ static void dump_items(FILE *f, const ConfigItem *items) { { config_parse_path, "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" }, @@ -1431,7 +1551,11 @@ static void dump_items(FILE *f, const ConfigItem *items) { { 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 [...]" }, @@ -1498,7 +1622,7 @@ static int load_from_path(Unit *u, const char *path) { { "Group", config_parse_string_printf, &(context).group, section }, \ { "SupplementaryGroups", config_parse_strv, &(context).supplementary_groups, section }, \ { "Nice", config_parse_nice, &(context), section }, \ - { "OOMAdjust", config_parse_oom_adjust, &(context), section }, \ + { "OOMScoreAdjust", config_parse_oom_score_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 }, \ @@ -1558,10 +1682,15 @@ static int load_from_path(Unit *u, const char *path) { { "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" }, + { "OnFailure", config_parse_deps, UINT_TO_PTR(UNIT_ON_FAILURE), "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" }, + { "RefuseManualStart", config_parse_bool, &u->meta.refuse_manual_start, "Unit" }, + { "RefuseManualStop", config_parse_bool, &u->meta.refuse_manual_stop, "Unit" }, + { "AllowIsolate", config_parse_bool, &u->meta.allow_isolate, "Unit" }, { "DefaultDependencies", config_parse_bool, &u->meta.default_dependencies, "Unit" }, + { "IgnoreDependencyFailure",config_parse_bool, &u->meta.ignore_dependency_failure, "Unit" }, + { "JobTimeoutSec", config_parse_usec, &u->meta.job_timeout, "Unit" }, { "PIDFile", config_parse_path, &u->service.pid_file, "Service" }, { "ExecStartPre", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START_PRE, "Service" }, @@ -1576,11 +1705,16 @@ static int load_from_path(Unit *u, const char *path) { { "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" }, + { "RemainAfterExit", config_parse_bool, &u->service.remain_after_exit, "Service" }, +#ifdef HAVE_SYSV_COMPAT { "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" }, +#else + { "SysVStartPriority", config_parse_warn_compat, NULL, "Service" }, +#endif { "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" }, { "BusName", config_parse_string_printf, &u->service.bus_name, "Service" }, { "NotifyAccess", config_parse_notify_access, &u->service.notify_access, "Service" }, + { "Sockets", config_parse_service_sockets, &u->service, "Service" }, EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"), { "ListenStream", config_parse_listen, &u->socket, "Socket" }, @@ -1608,6 +1742,8 @@ static int load_from_path(Unit *u, const char *path) { { "Mark", config_parse_int, &u->socket.mark, "Socket" }, { "PipeSize", config_parse_size, &u->socket.pipe_size, "Socket" }, { "FreeBind", config_parse_bool, &u->socket.free_bind, "Socket" }, + { "TCPCongestion", config_parse_string, &u->socket.tcp_congestion, "Socket" }, + { "Service", config_parse_socket_service, &u->socket, "Socket" }, EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"), { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" }, @@ -1652,6 +1788,7 @@ static int load_from_path(Unit *u, const char *path) { FILE *f = NULL; char *filename = NULL, *id = NULL; Unit *merged; + struct stat st; if (!u) { /* Dirty dirty hack. */ @@ -1725,6 +1862,7 @@ static int load_from_path(Unit *u, const char *path) { } if (!filename) { + /* Hmm, no suitable file found? */ r = 0; goto finish; } @@ -1739,15 +1877,28 @@ static int load_from_path(Unit *u, const char *path) { 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_BANNED; + 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: @@ -1762,68 +1913,79 @@ 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); + + /* 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.fragment_path) { + 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; + } + } - /* Try to find the unit under its id */ - if ((r = load_from_path(u, u->meta.id)) < 0) + /* 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; - /* 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;