-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
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;
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;
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"))
}
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;
}
}
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;
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;
return 0;
}
-static int config_parse_oom_adjust(
+static int config_parse_oom_score_adjust(
const char *filename,
unsigned line,
const char *section,
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;
}
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;
}
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;
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)
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;
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));
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);
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));
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);
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;
/* 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;
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);
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)
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;
}
}
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;
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;
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)
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;
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;
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;
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;
}
}
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)))
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;
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)))
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;
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)) {
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;
}
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;
{ 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" },
{ "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 }, \
{ "StopWhenUnneeded", config_parse_bool, &u->meta.stop_when_unneeded, "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" },
{ "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" },
{ "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" },
{ "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" },
{ "BusName", config_parse_string_printf, &u->service.bus_name, "Service" },
~ianmdlvl / elogind.git / blobdiff