Compare commits
No commits in common. "d2a56598d046f7c44b3dfdb098b92c83920295d9" and "a434236accc8bf072f919bb4c6e85b0dbc36e71f" have entirely different histories.
d2a56598d0
...
a434236acc
|
|
@ -5,9 +5,9 @@ title: What settings are currently available for transient units?
|
|||
# What settings are currently available for transient units?
|
||||
|
||||
Our intention is to make all settings that are available as unit file settings
|
||||
also available for transient units, through the D-Bus API. At the moment,
|
||||
device, swap, and target units are not supported at all as transient units, but
|
||||
others are pretty well supported.
|
||||
also available for transient units, through the D-Bus API. At the moment, some
|
||||
unit types (device, swap, target) are not supported at all via unit types,
|
||||
but most others are pretty well supported, with some notable omissions.
|
||||
|
||||
The lists below contain all settings currently available in unit files. The
|
||||
ones currently available in transient units are prefixed with `✓`.
|
||||
|
|
@ -44,14 +44,15 @@ Most generic unit settings are available for transient units.
|
|||
✓ JobRunningTimeoutSec=
|
||||
✓ JobTimeoutAction=
|
||||
✓ JobTimeoutRebootArgument=
|
||||
✓ StartLimitIntervalSec=
|
||||
✓ StartLimitBurst=
|
||||
✓ StartLimitAction=
|
||||
✓ StartLimitIntervalSec=SECONDS
|
||||
✓ StartLimitBurst=UNSIGNED
|
||||
✓ StartLimitAction=ACTION
|
||||
✓ FailureAction=
|
||||
✓ SuccessAction=
|
||||
✓ FailureActionExitStatus=
|
||||
✓ SuccessActionExitStatus=
|
||||
✓ RebootArgument=
|
||||
✓ AddRef=
|
||||
✓ RebootArgument=STRING
|
||||
✓ ConditionPathExists=
|
||||
✓ ConditionPathExistsGlob=
|
||||
✓ ConditionPathIsDirectory=
|
||||
|
|
@ -184,7 +185,6 @@ All execution-related settings are available for transient units.
|
|||
✓ PrivateMounts=
|
||||
✓ ProtectKernelTunables=
|
||||
✓ ProtectKernelModules=
|
||||
✓ ProtectKernelLogs=
|
||||
✓ ProtectControlGroups=
|
||||
✓ PrivateNetwork=
|
||||
✓ PrivateUsers=
|
||||
|
|
@ -271,7 +271,6 @@ All process killing settings are available for transient units:
|
|||
✓ SendSIGHUP=
|
||||
✓ KillMode=
|
||||
✓ KillSignal=
|
||||
✓ RestartKillSignal=
|
||||
✓ FinalKillSignal=
|
||||
✓ WatchdogSignal=
|
||||
```
|
||||
|
|
@ -311,7 +310,6 @@ Most service unit settings are available for transient units.
|
|||
Sockets=
|
||||
✓ USBFunctionDescriptors=
|
||||
✓ USBFunctionStrings=
|
||||
✓ OOMPolicy=
|
||||
```
|
||||
|
||||
## Mount Unit Settings
|
||||
|
|
|
|||
|
|
@ -309,13 +309,6 @@ static int bus_service_set_transient_property(
|
|||
if (streq(name, "TimeoutStopUSec"))
|
||||
return bus_set_transient_usec(u, name, &s->timeout_stop_usec, message, flags, error);
|
||||
|
||||
if (streq(name, "TimeoutAbortUSec")) {
|
||||
r = bus_set_transient_usec(u, name, &s->timeout_abort_usec, message, flags, error);
|
||||
if (r >= 0 && !UNIT_WRITE_FLAGS_NOOP(flags))
|
||||
s->timeout_abort_set = true;
|
||||
return r;
|
||||
}
|
||||
|
||||
if (streq(name, "RuntimeMaxUSec"))
|
||||
return bus_set_transient_usec(u, name, &s->runtime_max_usec, message, flags, error);
|
||||
|
||||
|
|
|
|||
|
|
@ -614,6 +614,7 @@ int config_parse_exec(
|
|||
assert(e);
|
||||
|
||||
e += ltype;
|
||||
rvalue += strspn(rvalue, WHITESPACE);
|
||||
|
||||
if (isempty(rvalue)) {
|
||||
/* An empty assignment resets the list */
|
||||
|
|
@ -1930,40 +1931,6 @@ int config_parse_service_timeout(
|
|||
return 0;
|
||||
}
|
||||
|
||||
int config_parse_timeout_abort(
|
||||
const char *unit,
|
||||
const char *filename,
|
||||
unsigned line,
|
||||
const char *section,
|
||||
unsigned section_line,
|
||||
const char *lvalue,
|
||||
int ltype,
|
||||
const char *rvalue,
|
||||
void *data,
|
||||
void *userdata) {
|
||||
|
||||
usec_t *ret = data;
|
||||
int r;
|
||||
|
||||
assert(filename);
|
||||
assert(lvalue);
|
||||
assert(rvalue);
|
||||
assert(ret);
|
||||
|
||||
/* Note: apart from setting the arg, this returns an extra bit of information in the return value. */
|
||||
|
||||
if (isempty(rvalue)) {
|
||||
*ret = 0;
|
||||
return 0; /* "not set" */
|
||||
}
|
||||
|
||||
r = parse_sec(rvalue, ret);
|
||||
if (r < 0)
|
||||
return log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s= setting, ignoring: %s", lvalue, rvalue);
|
||||
|
||||
return 1; /* "set" */
|
||||
}
|
||||
|
||||
int config_parse_service_timeout_abort(
|
||||
const char *unit,
|
||||
const char *filename,
|
||||
|
|
@ -1979,12 +1946,24 @@ int config_parse_service_timeout_abort(
|
|||
Service *s = userdata;
|
||||
int r;
|
||||
|
||||
assert(filename);
|
||||
assert(lvalue);
|
||||
assert(rvalue);
|
||||
assert(s);
|
||||
|
||||
r = config_parse_timeout_abort(unit, filename, line, section, section_line, lvalue, ltype, rvalue,
|
||||
&s->timeout_abort_usec, s);
|
||||
if (r >= 0)
|
||||
s->timeout_abort_set = r;
|
||||
rvalue += strspn(rvalue, WHITESPACE);
|
||||
if (isempty(rvalue)) {
|
||||
s->timeout_abort_set = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = parse_sec(rvalue, &s->timeout_abort_usec);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse TimeoutAbortSec= setting, ignoring: %s", rvalue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->timeout_abort_set = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -5002,3 +4981,39 @@ int config_parse_crash_chvt(
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int config_parse_timeout_abort(
|
||||
const char* unit,
|
||||
const char *filename,
|
||||
unsigned line,
|
||||
const char *section,
|
||||
unsigned section_line,
|
||||
const char *lvalue,
|
||||
int ltype,
|
||||
const char *rvalue,
|
||||
void *data,
|
||||
void *userdata) {
|
||||
|
||||
usec_t *timeout_usec = data;
|
||||
int r;
|
||||
|
||||
assert(filename);
|
||||
assert(lvalue);
|
||||
assert(rvalue);
|
||||
assert(timeout_usec);
|
||||
|
||||
rvalue += strspn(rvalue, WHITESPACE);
|
||||
if (isempty(rvalue)) {
|
||||
*timeout_usec = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = parse_sec(rvalue, timeout_usec);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse DefaultTimeoutAbortSec= setting, ignoring: %s", rvalue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
*timeout_usec = true;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
141
src/core/main.c
141
src/core/main.c
|
|
@ -539,90 +539,71 @@ DEFINE_SETTER(config_parse_target, log_set_target_from_string, "target");
|
|||
DEFINE_SETTER(config_parse_color, log_show_color_from_string, "color" );
|
||||
DEFINE_SETTER(config_parse_location, log_show_location_from_string, "location");
|
||||
|
||||
static int config_parse_default_timeout_abort(
|
||||
const char *unit,
|
||||
const char *filename,
|
||||
unsigned line,
|
||||
const char *section,
|
||||
unsigned section_line,
|
||||
const char *lvalue,
|
||||
int ltype,
|
||||
const char *rvalue,
|
||||
void *data,
|
||||
void *userdata) {
|
||||
int r;
|
||||
|
||||
r = config_parse_timeout_abort(unit, filename, line, section, section_line, lvalue, ltype, rvalue,
|
||||
&arg_default_timeout_abort_usec, userdata);
|
||||
if (r >= 0)
|
||||
arg_default_timeout_abort_set = r;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int parse_config_file(void) {
|
||||
|
||||
const ConfigTableItem items[] = {
|
||||
{ "Manager", "LogLevel", config_parse_level2, 0, NULL },
|
||||
{ "Manager", "LogTarget", config_parse_target, 0, NULL },
|
||||
{ "Manager", "LogColor", config_parse_color, 0, NULL },
|
||||
{ "Manager", "LogLocation", config_parse_location, 0, NULL },
|
||||
{ "Manager", "DumpCore", config_parse_bool, 0, &arg_dump_core },
|
||||
{ "Manager", "CrashChVT", /* legacy */ config_parse_crash_chvt, 0, &arg_crash_chvt },
|
||||
{ "Manager", "CrashChangeVT", config_parse_crash_chvt, 0, &arg_crash_chvt },
|
||||
{ "Manager", "CrashShell", config_parse_bool, 0, &arg_crash_shell },
|
||||
{ "Manager", "CrashReboot", config_parse_bool, 0, &arg_crash_reboot },
|
||||
{ "Manager", "ShowStatus", config_parse_show_status, 0, &arg_show_status },
|
||||
{ "Manager", "StatusUnitFormat", config_parse_status_unit_format, 0, &arg_status_unit_format },
|
||||
{ "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, &arg_cpu_affinity },
|
||||
{ "Manager", "NUMAPolicy", config_parse_numa_policy, 0, &arg_numa_policy.type },
|
||||
{ "Manager", "NUMAMask", config_parse_numa_mask, 0, &arg_numa_policy },
|
||||
{ "Manager", "JoinControllers", config_parse_warn_compat, DISABLED_CONFIGURATION, NULL },
|
||||
{ "Manager", "RuntimeWatchdogSec", config_parse_sec, 0, &arg_runtime_watchdog },
|
||||
{ "Manager", "RebootWatchdogSec", config_parse_sec, 0, &arg_reboot_watchdog },
|
||||
{ "Manager", "ShutdownWatchdogSec", config_parse_sec, 0, &arg_reboot_watchdog }, /* obsolete alias */
|
||||
{ "Manager", "KExecWatchdogSec", config_parse_sec, 0, &arg_kexec_watchdog },
|
||||
{ "Manager", "WatchdogDevice", config_parse_path, 0, &arg_watchdog_device },
|
||||
{ "Manager", "CapabilityBoundingSet", config_parse_capability_set, 0, &arg_capability_bounding_set },
|
||||
{ "Manager", "NoNewPrivileges", config_parse_bool, 0, &arg_no_new_privs },
|
||||
{ "Manager", "LogLevel", config_parse_level2, 0, NULL },
|
||||
{ "Manager", "LogTarget", config_parse_target, 0, NULL },
|
||||
{ "Manager", "LogColor", config_parse_color, 0, NULL },
|
||||
{ "Manager", "LogLocation", config_parse_location, 0, NULL },
|
||||
{ "Manager", "DumpCore", config_parse_bool, 0, &arg_dump_core },
|
||||
{ "Manager", "CrashChVT", /* legacy */ config_parse_crash_chvt, 0, &arg_crash_chvt },
|
||||
{ "Manager", "CrashChangeVT", config_parse_crash_chvt, 0, &arg_crash_chvt },
|
||||
{ "Manager", "CrashShell", config_parse_bool, 0, &arg_crash_shell },
|
||||
{ "Manager", "CrashReboot", config_parse_bool, 0, &arg_crash_reboot },
|
||||
{ "Manager", "ShowStatus", config_parse_show_status, 0, &arg_show_status },
|
||||
{ "Manager", "StatusUnitFormat", config_parse_status_unit_format, 0, &arg_status_unit_format },
|
||||
{ "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, &arg_cpu_affinity },
|
||||
{ "Manager", "NUMAPolicy", config_parse_numa_policy, 0, &arg_numa_policy.type },
|
||||
{ "Manager", "NUMAMask", config_parse_numa_mask, 0, &arg_numa_policy },
|
||||
{ "Manager", "JoinControllers", config_parse_warn_compat, DISABLED_CONFIGURATION, NULL },
|
||||
{ "Manager", "RuntimeWatchdogSec", config_parse_sec, 0, &arg_runtime_watchdog },
|
||||
{ "Manager", "RebootWatchdogSec", config_parse_sec, 0, &arg_reboot_watchdog },
|
||||
{ "Manager", "ShutdownWatchdogSec", config_parse_sec, 0, &arg_reboot_watchdog }, /* obsolete alias */
|
||||
{ "Manager", "KExecWatchdogSec", config_parse_sec, 0, &arg_kexec_watchdog },
|
||||
{ "Manager", "WatchdogDevice", config_parse_path, 0, &arg_watchdog_device },
|
||||
{ "Manager", "CapabilityBoundingSet", config_parse_capability_set, 0, &arg_capability_bounding_set },
|
||||
{ "Manager", "NoNewPrivileges", config_parse_bool, 0, &arg_no_new_privs },
|
||||
#if HAVE_SECCOMP
|
||||
{ "Manager", "SystemCallArchitectures", config_parse_syscall_archs, 0, &arg_syscall_archs },
|
||||
{ "Manager", "SystemCallArchitectures", config_parse_syscall_archs, 0, &arg_syscall_archs },
|
||||
#endif
|
||||
{ "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec },
|
||||
{ "Manager", "DefaultTimerAccuracySec", config_parse_sec, 0, &arg_default_timer_accuracy_usec },
|
||||
{ "Manager", "DefaultStandardOutput", config_parse_output_restricted, 0, &arg_default_std_output },
|
||||
{ "Manager", "DefaultStandardError", config_parse_output_restricted, 0, &arg_default_std_error },
|
||||
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
|
||||
{ "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec },
|
||||
{ "Manager", "DefaultTimeoutAbortSec", config_parse_default_timeout_abort, 0, NULL },
|
||||
{ "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec },
|
||||
{ "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, /* obsolete alias */
|
||||
{ "Manager", "DefaultStartLimitIntervalSec", config_parse_sec, 0, &arg_default_start_limit_interval },
|
||||
{ "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst },
|
||||
{ "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment },
|
||||
{ "Manager", "DefaultLimitCPU", config_parse_rlimit, RLIMIT_CPU, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitFSIZE", config_parse_rlimit, RLIMIT_FSIZE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitDATA", config_parse_rlimit, RLIMIT_DATA, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitSTACK", config_parse_rlimit, RLIMIT_STACK, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitCORE", config_parse_rlimit, RLIMIT_CORE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRSS", config_parse_rlimit, RLIMIT_RSS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNOFILE", config_parse_rlimit, RLIMIT_NOFILE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitAS", config_parse_rlimit, RLIMIT_AS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNPROC", config_parse_rlimit, RLIMIT_NPROC, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitMEMLOCK", config_parse_rlimit, RLIMIT_MEMLOCK, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitLOCKS", config_parse_rlimit, RLIMIT_LOCKS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitSIGPENDING", config_parse_rlimit, RLIMIT_SIGPENDING, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitMSGQUEUE", config_parse_rlimit, RLIMIT_MSGQUEUE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNICE", config_parse_rlimit, RLIMIT_NICE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRTPRIO", config_parse_rlimit, RLIMIT_RTPRIO, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRTTIME", config_parse_rlimit, RLIMIT_RTTIME, arg_default_rlimit },
|
||||
{ "Manager", "DefaultCPUAccounting", config_parse_tristate, 0, &arg_default_cpu_accounting },
|
||||
{ "Manager", "DefaultIOAccounting", config_parse_bool, 0, &arg_default_io_accounting },
|
||||
{ "Manager", "DefaultIPAccounting", config_parse_bool, 0, &arg_default_ip_accounting },
|
||||
{ "Manager", "DefaultBlockIOAccounting", config_parse_bool, 0, &arg_default_blockio_accounting },
|
||||
{ "Manager", "DefaultMemoryAccounting", config_parse_bool, 0, &arg_default_memory_accounting },
|
||||
{ "Manager", "DefaultTasksAccounting", config_parse_bool, 0, &arg_default_tasks_accounting },
|
||||
{ "Manager", "DefaultTasksMax", config_parse_tasks_max, 0, &arg_default_tasks_max },
|
||||
{ "Manager", "CtrlAltDelBurstAction", config_parse_emergency_action, 0, &arg_cad_burst_action },
|
||||
{ "Manager", "DefaultOOMPolicy", config_parse_oom_policy, 0, &arg_default_oom_policy },
|
||||
{ "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec },
|
||||
{ "Manager", "DefaultTimerAccuracySec", config_parse_sec, 0, &arg_default_timer_accuracy_usec },
|
||||
{ "Manager", "DefaultStandardOutput", config_parse_output_restricted, 0, &arg_default_std_output },
|
||||
{ "Manager", "DefaultStandardError", config_parse_output_restricted, 0, &arg_default_std_error },
|
||||
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
|
||||
{ "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec },
|
||||
{ "Manager", "DefaultTimeoutAbortSec", config_parse_timeout_abort, 0, &arg_default_timeout_abort_set },
|
||||
{ "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec },
|
||||
{ "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, /* obsolete alias */
|
||||
{ "Manager", "DefaultStartLimitIntervalSec", config_parse_sec, 0, &arg_default_start_limit_interval },
|
||||
{ "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst },
|
||||
{ "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment },
|
||||
{ "Manager", "DefaultLimitCPU", config_parse_rlimit, RLIMIT_CPU, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitFSIZE", config_parse_rlimit, RLIMIT_FSIZE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitDATA", config_parse_rlimit, RLIMIT_DATA, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitSTACK", config_parse_rlimit, RLIMIT_STACK, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitCORE", config_parse_rlimit, RLIMIT_CORE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRSS", config_parse_rlimit, RLIMIT_RSS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNOFILE", config_parse_rlimit, RLIMIT_NOFILE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitAS", config_parse_rlimit, RLIMIT_AS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNPROC", config_parse_rlimit, RLIMIT_NPROC, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitMEMLOCK", config_parse_rlimit, RLIMIT_MEMLOCK, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitLOCKS", config_parse_rlimit, RLIMIT_LOCKS, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitSIGPENDING", config_parse_rlimit, RLIMIT_SIGPENDING, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitMSGQUEUE", config_parse_rlimit, RLIMIT_MSGQUEUE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitNICE", config_parse_rlimit, RLIMIT_NICE, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRTPRIO", config_parse_rlimit, RLIMIT_RTPRIO, arg_default_rlimit },
|
||||
{ "Manager", "DefaultLimitRTTIME", config_parse_rlimit, RLIMIT_RTTIME, arg_default_rlimit },
|
||||
{ "Manager", "DefaultCPUAccounting", config_parse_tristate, 0, &arg_default_cpu_accounting },
|
||||
{ "Manager", "DefaultIOAccounting", config_parse_bool, 0, &arg_default_io_accounting },
|
||||
{ "Manager", "DefaultIPAccounting", config_parse_bool, 0, &arg_default_ip_accounting },
|
||||
{ "Manager", "DefaultBlockIOAccounting", config_parse_bool, 0, &arg_default_blockio_accounting },
|
||||
{ "Manager", "DefaultMemoryAccounting", config_parse_bool, 0, &arg_default_memory_accounting },
|
||||
{ "Manager", "DefaultTasksAccounting", config_parse_bool, 0, &arg_default_tasks_accounting },
|
||||
{ "Manager", "DefaultTasksMax", config_parse_tasks_max, 0, &arg_default_tasks_max },
|
||||
{ "Manager", "CtrlAltDelBurstAction", config_parse_emergency_action, 0, &arg_cad_burst_action },
|
||||
{ "Manager", "DefaultOOMPolicy", config_parse_oom_policy, 0, &arg_default_oom_policy },
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static int retrieve_key(key_serial_t serial, char ***ret) {
|
|||
n = keyctl(KEYCTL_READ, (unsigned long) serial, (unsigned long) p, (unsigned long) m, 0);
|
||||
if (n < 0)
|
||||
return -errno;
|
||||
if ((size_t) n <= m) {
|
||||
if ((size_t) n < m) {
|
||||
nfinal = (size_t) n;
|
||||
pfinal = TAKE_PTR(p);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -421,26 +421,18 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
|
|||
if (STR_IN_SET(field, "DevicePolicy", "Slice"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "CPUAccounting",
|
||||
"MemoryAccounting",
|
||||
"IOAccounting",
|
||||
"BlockIOAccounting",
|
||||
"TasksAccounting",
|
||||
"IPAccounting"))
|
||||
if (STR_IN_SET(field,
|
||||
"CPUAccounting", "MemoryAccounting", "IOAccounting", "BlockIOAccounting",
|
||||
"TasksAccounting", "IPAccounting"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "CPUWeight",
|
||||
"StartupCPUWeight",
|
||||
"IOWeight",
|
||||
"StartupIOWeight"))
|
||||
if (STR_IN_SET(field, "CPUWeight", "StartupCPUWeight", "IOWeight", "StartupIOWeight"))
|
||||
return bus_append_cg_weight_parse(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "CPUShares",
|
||||
"StartupCPUShares"))
|
||||
if (STR_IN_SET(field, "CPUShares", "StartupCPUShares"))
|
||||
return bus_append_cg_cpu_shares_parse(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "AllowedCPUs",
|
||||
"AllowedMemoryNodes")) {
|
||||
if (STR_IN_SET(field, "AllowedCPUs", "AllowedMemoryNodes")) {
|
||||
_cleanup_(cpu_set_reset) CPUSet cpuset = {};
|
||||
_cleanup_free_ uint8_t *array = NULL;
|
||||
size_t allocated;
|
||||
|
|
@ -456,8 +448,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
|
|||
return bus_append_byte_array(m, field, array, allocated);
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "BlockIOWeight",
|
||||
"StartupBlockIOWeight"))
|
||||
if (STR_IN_SET(field, "BlockIOWeight", "StartupBlockIOWeight"))
|
||||
return bus_append_cg_blkio_weight_parse(m, field, eq);
|
||||
|
||||
if (streq(field, "DisableControllers"))
|
||||
|
|
@ -602,8 +593,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "IODeviceWeight",
|
||||
"BlockIODeviceWeight")) {
|
||||
if (STR_IN_SET(field, "IODeviceWeight", "BlockIODeviceWeight")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", field, "a(st)", 0);
|
||||
else {
|
||||
|
|
@ -663,8 +653,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "IPAddressAllow",
|
||||
"IPAddressDeny")) {
|
||||
if (STR_IN_SET(field, "IPAddressAllow", "IPAddressDeny")) {
|
||||
unsigned char prefixlen;
|
||||
union in_addr_union prefix = {};
|
||||
int family;
|
||||
|
|
@ -784,8 +773,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "IPIngressFilterPath",
|
||||
"IPEgressFilterPath")) {
|
||||
if (STR_IN_SET(field, "IPIngressFilterPath", "IPEgressFilterPath")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", field, "as", 0);
|
||||
else
|
||||
|
|
@ -817,68 +805,31 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
const char *suffix;
|
||||
int r;
|
||||
|
||||
if (STR_IN_SET(field, "User",
|
||||
"Group",
|
||||
"UtmpIdentifier",
|
||||
"UtmpMode",
|
||||
"PAMName",
|
||||
"TTYPath",
|
||||
"WorkingDirectory",
|
||||
"RootDirectory",
|
||||
"SyslogIdentifier",
|
||||
"ProtectSystem",
|
||||
"ProtectHome",
|
||||
"SELinuxContext",
|
||||
"RootImage",
|
||||
"RuntimeDirectoryPreserve",
|
||||
"Personality",
|
||||
"KeyringMode",
|
||||
"NetworkNamespacePath"))
|
||||
if (STR_IN_SET(field,
|
||||
"User", "Group",
|
||||
"UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath",
|
||||
"WorkingDirectory", "RootDirectory", "SyslogIdentifier",
|
||||
"ProtectSystem", "ProtectHome", "SELinuxContext", "RootImage",
|
||||
"RuntimeDirectoryPreserve", "Personality", "KeyringMode", "NetworkNamespacePath"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "IgnoreSIGPIPE",
|
||||
"TTYVHangup",
|
||||
"TTYReset",
|
||||
"TTYVTDisallocate",
|
||||
"PrivateTmp",
|
||||
"PrivateDevices",
|
||||
"PrivateNetwork",
|
||||
"PrivateUsers",
|
||||
"PrivateMounts",
|
||||
"NoNewPrivileges",
|
||||
"SyslogLevelPrefix",
|
||||
"MemoryDenyWriteExecute",
|
||||
"RestrictRealtime",
|
||||
"DynamicUser",
|
||||
"RemoveIPC",
|
||||
"ProtectKernelTunables",
|
||||
"ProtectKernelModules",
|
||||
"ProtectKernelLogs",
|
||||
"ProtectControlGroups",
|
||||
"MountAPIVFS",
|
||||
"CPUSchedulingResetOnFork",
|
||||
"LockPersonality",
|
||||
"ProtectHostname",
|
||||
"RestrictSUIDSGID"))
|
||||
if (STR_IN_SET(field,
|
||||
"IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "TTYVTDisallocate", "PrivateTmp",
|
||||
"PrivateDevices", "PrivateNetwork", "PrivateUsers", "PrivateMounts",
|
||||
"NoNewPrivileges", "SyslogLevelPrefix", "MemoryDenyWriteExecute", "RestrictRealtime",
|
||||
"DynamicUser", "RemoveIPC", "ProtectKernelTunables", "ProtectKernelModules",
|
||||
"ProtectKernelLogs", "ProtectControlGroups", "MountAPIVFS", "CPUSchedulingResetOnFork",
|
||||
"LockPersonality", "ProtectHostname", "RestrictSUIDSGID"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "ReadWriteDirectories",
|
||||
"ReadOnlyDirectories",
|
||||
"InaccessibleDirectories",
|
||||
"ReadWritePaths",
|
||||
"ReadOnlyPaths",
|
||||
"InaccessiblePaths",
|
||||
"RuntimeDirectory",
|
||||
"StateDirectory",
|
||||
"CacheDirectory",
|
||||
"LogsDirectory",
|
||||
"ConfigurationDirectory",
|
||||
"SupplementaryGroups",
|
||||
"SystemCallArchitectures"))
|
||||
if (STR_IN_SET(field,
|
||||
"ReadWriteDirectories", "ReadOnlyDirectories", "InaccessibleDirectories",
|
||||
"ReadWritePaths", "ReadOnlyPaths", "InaccessiblePaths",
|
||||
"RuntimeDirectory", "StateDirectory", "CacheDirectory", "LogsDirectory", "ConfigurationDirectory",
|
||||
"SupplementaryGroups", "SystemCallArchitectures"))
|
||||
return bus_append_strv(m, field, eq, EXTRACT_UNQUOTE);
|
||||
|
||||
if (STR_IN_SET(field, "SyslogLevel",
|
||||
"LogLevelMax"))
|
||||
if (STR_IN_SET(field, "SyslogLevel", "LogLevelMax"))
|
||||
return bus_append_log_level_from_string(m, field, eq);
|
||||
|
||||
if (streq(field, "SyslogFacility"))
|
||||
|
|
@ -890,8 +841,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
if (streq(field, "CPUSchedulingPolicy"))
|
||||
return bus_append_sched_policy_from_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "CPUSchedulingPriority",
|
||||
"OOMScoreAdjust"))
|
||||
if (STR_IN_SET(field, "CPUSchedulingPriority", "OOMScoreAdjust"))
|
||||
return bus_append_safe_atoi(m, field, eq);
|
||||
|
||||
if (streq(field, "Nice"))
|
||||
|
|
@ -906,12 +856,9 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
if (streq(field, "IOSchedulingPriority"))
|
||||
return bus_append_ioprio_parse_priority(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "RuntimeDirectoryMode",
|
||||
"StateDirectoryMode",
|
||||
"CacheDirectoryMode",
|
||||
"LogsDirectoryMode",
|
||||
"ConfigurationDirectoryMode",
|
||||
"UMask"))
|
||||
if (STR_IN_SET(field,
|
||||
"RuntimeDirectoryMode", "StateDirectoryMode", "CacheDirectoryMode",
|
||||
"LogsDirectoryMode", "ConfigurationDirectoryMode", "UMask"))
|
||||
return bus_append_parse_mode(m, field, eq);
|
||||
|
||||
if (streq(field, "TimerSlackNSec"))
|
||||
|
|
@ -926,9 +873,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
if (streq(field, "MountFlags"))
|
||||
return bus_append_mount_propagation_flags_from_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "Environment",
|
||||
"UnsetEnvironment",
|
||||
"PassEnvironment"))
|
||||
if (STR_IN_SET(field, "Environment", "UnsetEnvironment", "PassEnvironment"))
|
||||
return bus_append_strv(m, field, eq, EXTRACT_UNQUOTE|EXTRACT_CUNESCAPE);
|
||||
|
||||
if (streq(field, "EnvironmentFile")) {
|
||||
|
|
@ -980,9 +925,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "StandardInput",
|
||||
"StandardOutput",
|
||||
"StandardError")) {
|
||||
if (STR_IN_SET(field, "StandardInput", "StandardOutput", "StandardError")) {
|
||||
const char *n, *appended;
|
||||
|
||||
if ((n = startswith(eq, "fd:"))) {
|
||||
|
|
@ -1054,8 +997,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
}
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "AppArmorProfile",
|
||||
"SmackProcessLabel")) {
|
||||
if (STR_IN_SET(field, "AppArmorProfile", "SmackProcessLabel")) {
|
||||
int ignore = 0;
|
||||
const char *s = eq;
|
||||
|
||||
|
|
@ -1071,8 +1013,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "CapabilityBoundingSet",
|
||||
"AmbientCapabilities")) {
|
||||
if (STR_IN_SET(field, "CapabilityBoundingSet", "AmbientCapabilities")) {
|
||||
uint64_t sum = 0;
|
||||
bool invert = false;
|
||||
const char *p = eq;
|
||||
|
|
@ -1139,8 +1080,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
return bus_append_byte_array(m, field, array, allocated);
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "RestrictAddressFamilies",
|
||||
"SystemCallFilter")) {
|
||||
if (STR_IN_SET(field, "RestrictAddressFamilies", "SystemCallFilter")) {
|
||||
int whitelist = 1;
|
||||
const char *p = eq;
|
||||
|
||||
|
|
@ -1238,8 +1178,7 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (STR_IN_SET(field, "BindPaths",
|
||||
"BindReadOnlyPaths")) {
|
||||
if (STR_IN_SET(field, "BindPaths", "BindReadOnlyPaths")) {
|
||||
const char *p = eq;
|
||||
|
||||
r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
|
||||
|
|
@ -1391,14 +1330,10 @@ static int bus_append_kill_property(sd_bus_message *m, const char *field, const
|
|||
if (streq(field, "KillMode"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "SendSIGHUP",
|
||||
"SendSIGKILL"))
|
||||
if (STR_IN_SET(field, "SendSIGHUP", "SendSIGKILL"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "KillSignal",
|
||||
"RestartKillSignal",
|
||||
"FinalKillSignal",
|
||||
"WatchdogSignal"))
|
||||
if (STR_IN_SET(field, "KillSignal", "RestartKillSignal", "FinalKillSignal", "WatchdogSignal"))
|
||||
return bus_append_signal_from_string(m, field, eq);
|
||||
|
||||
return 0;
|
||||
|
|
@ -1406,10 +1341,7 @@ static int bus_append_kill_property(sd_bus_message *m, const char *field, const
|
|||
|
||||
static int bus_append_mount_property(sd_bus_message *m, const char *field, const char *eq) {
|
||||
|
||||
if (STR_IN_SET(field, "What",
|
||||
"Where",
|
||||
"Options",
|
||||
"Type"))
|
||||
if (STR_IN_SET(field, "What", "Where", "Options", "Type"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (streq(field, "TimeoutSec"))
|
||||
|
|
@ -1418,9 +1350,7 @@ static int bus_append_mount_property(sd_bus_message *m, const char *field, const
|
|||
if (streq(field, "DirectoryMode"))
|
||||
return bus_append_parse_mode(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "SloppyOptions",
|
||||
"LazyUnmount",
|
||||
"ForceUnmount"))
|
||||
if (STR_IN_SET(field, "SloppyOptions", "LazyUnmount", "ForceUnmount"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
return 0;
|
||||
|
|
@ -1435,11 +1365,9 @@ static int bus_append_path_property(sd_bus_message *m, const char *field, const
|
|||
if (streq(field, "DirectoryMode"))
|
||||
return bus_append_parse_mode(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "PathExists",
|
||||
"PathExistsGlob",
|
||||
"PathChanged",
|
||||
"PathModified",
|
||||
"DirectoryNotEmpty")) {
|
||||
if (STR_IN_SET(field,
|
||||
"PathExists", "PathExistsGlob", "PathChanged",
|
||||
"PathModified", "DirectoryNotEmpty")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", "Paths", "a(ss)", 0);
|
||||
else
|
||||
|
|
@ -1455,9 +1383,11 @@ static int bus_append_path_property(sd_bus_message *m, const char *field, const
|
|||
|
||||
static int bus_append_scope_property(sd_bus_message *m, const char *field, const char *eq) {
|
||||
if (streq(field, "RuntimeMaxSec"))
|
||||
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
if (streq(field, "TimeoutStopSec"))
|
||||
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
return 0;
|
||||
|
|
@ -1466,28 +1396,15 @@ static int bus_append_scope_property(sd_bus_message *m, const char *field, const
|
|||
static int bus_append_service_property(sd_bus_message *m, const char *field, const char *eq) {
|
||||
int r;
|
||||
|
||||
if (STR_IN_SET(field, "PIDFile",
|
||||
"Type",
|
||||
"Restart",
|
||||
"BusName",
|
||||
"NotifyAccess",
|
||||
"USBFunctionDescriptors",
|
||||
"USBFunctionStrings",
|
||||
"OOMPolicy"))
|
||||
if (STR_IN_SET(field,
|
||||
"PIDFile", "Type", "Restart", "BusName", "NotifyAccess",
|
||||
"USBFunctionDescriptors", "USBFunctionStrings", "OOMPolicy"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "PermissionsStartOnly",
|
||||
"RootDirectoryStartOnly",
|
||||
"RemainAfterExit",
|
||||
"GuessMainPID"))
|
||||
if (STR_IN_SET(field, "PermissionsStartOnly", "RootDirectoryStartOnly", "RemainAfterExit", "GuessMainPID"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "RestartSec",
|
||||
"TimeoutStartSec",
|
||||
"TimeoutStopSec",
|
||||
"TimeoutAbortSec",
|
||||
"RuntimeMaxSec",
|
||||
"WatchdogSec"))
|
||||
if (STR_IN_SET(field, "RestartSec", "TimeoutStartSec", "TimeoutStopSec", "RuntimeMaxSec", "WatchdogSec"))
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
if (streq(field, "TimeoutSec")) {
|
||||
|
|
@ -1501,25 +1418,14 @@ static int bus_append_service_property(sd_bus_message *m, const char *field, con
|
|||
if (streq(field, "FileDescriptorStoreMax"))
|
||||
return bus_append_safe_atou(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "ExecCondition",
|
||||
"ExecStartPre",
|
||||
"ExecStart",
|
||||
"ExecStartPost",
|
||||
"ExecConditionEx",
|
||||
"ExecStartPreEx",
|
||||
"ExecStartEx",
|
||||
"ExecStartPostEx",
|
||||
"ExecReload",
|
||||
"ExecStop",
|
||||
"ExecStopPost",
|
||||
"ExecReloadEx",
|
||||
"ExecStopEx",
|
||||
"ExecStopPostEx"))
|
||||
if (STR_IN_SET(field,
|
||||
"ExecCondition", "ExecStartPre", "ExecStart", "ExecStartPost",
|
||||
"ExecConditionEx", "ExecStartPreEx", "ExecStartEx", "ExecStartPostEx",
|
||||
"ExecReload", "ExecStop", "ExecStopPost",
|
||||
"ExecReloadEx", "ExecStopEx", "ExecStopPostEx"))
|
||||
return bus_append_exec_command(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "RestartPreventExitStatus",
|
||||
"RestartForceExitStatus",
|
||||
"SuccessExitStatus")) {
|
||||
if (STR_IN_SET(field, "RestartPreventExitStatus", "RestartForceExitStatus", "SuccessExitStatus")) {
|
||||
_cleanup_free_ int *status = NULL, *signal = NULL;
|
||||
size_t n_status = 0, n_signal = 0;
|
||||
const char *p;
|
||||
|
|
@ -1606,70 +1512,39 @@ static int bus_append_service_property(sd_bus_message *m, const char *field, con
|
|||
static int bus_append_socket_property(sd_bus_message *m, const char *field, const char *eq) {
|
||||
int r;
|
||||
|
||||
if (STR_IN_SET(field, "Accept",
|
||||
"Writable",
|
||||
"KeepAlive",
|
||||
"NoDelay",
|
||||
"FreeBind",
|
||||
"Transparent",
|
||||
"Broadcast",
|
||||
"PassCredentials",
|
||||
"PassSecurity",
|
||||
"ReusePort",
|
||||
"RemoveOnStop",
|
||||
"SELinuxContextFromNet"))
|
||||
if (STR_IN_SET(field,
|
||||
"Accept", "Writable", "KeepAlive", "NoDelay", "FreeBind", "Transparent", "Broadcast",
|
||||
"PassCredentials", "PassSecurity", "ReusePort", "RemoveOnStop", "SELinuxContextFromNet"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "Priority",
|
||||
"IPTTL",
|
||||
"Mark"))
|
||||
if (STR_IN_SET(field, "Priority", "IPTTL", "Mark"))
|
||||
return bus_append_safe_atoi(m, field, eq);
|
||||
|
||||
if (streq(field, "IPTOS"))
|
||||
return bus_append_ip_tos_from_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "Backlog",
|
||||
"MaxConnections",
|
||||
"MaxConnectionsPerSource",
|
||||
"KeepAliveProbes",
|
||||
"TriggerLimitBurst"))
|
||||
if (STR_IN_SET(field, "Backlog", "MaxConnections", "MaxConnectionsPerSource", "KeepAliveProbes", "TriggerLimitBurst"))
|
||||
return bus_append_safe_atou(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "SocketMode",
|
||||
"DirectoryMode"))
|
||||
if (STR_IN_SET(field, "SocketMode", "DirectoryMode"))
|
||||
return bus_append_parse_mode(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "MessageQueueMaxMessages",
|
||||
"MessageQueueMessageSize"))
|
||||
if (STR_IN_SET(field, "MessageQueueMaxMessages", "MessageQueueMessageSize"))
|
||||
return bus_append_safe_atoi64(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "TimeoutSec",
|
||||
"KeepAliveTimeSec",
|
||||
"KeepAliveIntervalSec",
|
||||
"DeferAcceptSec",
|
||||
"TriggerLimitIntervalSec"))
|
||||
if (STR_IN_SET(field, "TimeoutSec", "KeepAliveTimeSec", "KeepAliveIntervalSec", "DeferAcceptSec", "TriggerLimitIntervalSec"))
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "ReceiveBuffer",
|
||||
"SendBuffer",
|
||||
"PipeSize"))
|
||||
if (STR_IN_SET(field, "ReceiveBuffer", "SendBuffer", "PipeSize"))
|
||||
return bus_append_parse_size(m, field, eq, 1024);
|
||||
|
||||
if (STR_IN_SET(field, "ExecStartPre",
|
||||
"ExecStartPost",
|
||||
"ExecReload",
|
||||
"ExecStopPost"))
|
||||
if (STR_IN_SET(field, "ExecStartPre", "ExecStartPost", "ExecReload", "ExecStopPost"))
|
||||
return bus_append_exec_command(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "SmackLabel",
|
||||
"SmackLabelIPIn",
|
||||
"SmackLabelIPOut",
|
||||
"TCPCongestion",
|
||||
"BindToDevice",
|
||||
"BindIPv6Only",
|
||||
"FileDescriptorName",
|
||||
"SocketUser",
|
||||
"SocketGroup"))
|
||||
if (STR_IN_SET(field,
|
||||
"SmackLabel", "SmackLabelIPIn", "SmackLabelIPOut", "TCPCongestion",
|
||||
"BindToDevice", "BindIPv6Only", "FileDescriptorName",
|
||||
"SocketUser", "SocketGroup"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (streq(field, "Symlinks"))
|
||||
|
|
@ -1678,14 +1553,9 @@ static int bus_append_socket_property(sd_bus_message *m, const char *field, cons
|
|||
if (streq(field, "SocketProtocol"))
|
||||
return bus_append_parse_ip_protocol(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "ListenStream",
|
||||
"ListenDatagram",
|
||||
"ListenSequentialPacket",
|
||||
"ListenNetlink",
|
||||
"ListenSpecial",
|
||||
"ListenMessageQueue",
|
||||
"ListenFIFO",
|
||||
"ListenUSBFunction")) {
|
||||
if (STR_IN_SET(field,
|
||||
"ListenStream", "ListenDatagram", "ListenSequentialPacket", "ListenNetlink",
|
||||
"ListenSpecial", "ListenMessageQueue", "ListenFIFO", "ListenUSBFunction")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", "Listen", "a(ss)", 0);
|
||||
else
|
||||
|
|
@ -1701,22 +1571,16 @@ static int bus_append_socket_property(sd_bus_message *m, const char *field, cons
|
|||
static int bus_append_timer_property(sd_bus_message *m, const char *field, const char *eq) {
|
||||
int r;
|
||||
|
||||
if (STR_IN_SET(field, "WakeSystem",
|
||||
"RemainAfterElapse",
|
||||
"Persistent",
|
||||
"OnTimezoneChange",
|
||||
"OnClockChange"))
|
||||
if (STR_IN_SET(field, "WakeSystem", "RemainAfterElapse", "Persistent",
|
||||
"OnTimezoneChange", "OnClockChange"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "AccuracySec",
|
||||
"RandomizedDelaySec"))
|
||||
if (STR_IN_SET(field, "AccuracySec", "RandomizedDelaySec"))
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "OnActiveSec",
|
||||
"OnBootSec",
|
||||
"OnStartupSec",
|
||||
"OnUnitActiveSec",
|
||||
"OnUnitInactiveSec")) {
|
||||
if (STR_IN_SET(field,
|
||||
"OnActiveSec", "OnBootSec", "OnStartupSec",
|
||||
"OnUnitActiveSec","OnUnitInactiveSec")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 0);
|
||||
else {
|
||||
|
|
@ -1752,36 +1616,25 @@ static int bus_append_unit_property(sd_bus_message *m, const char *field, const
|
|||
bool is_condition = false;
|
||||
int r;
|
||||
|
||||
if (STR_IN_SET(field, "Description",
|
||||
"SourcePath",
|
||||
"OnFailureJobMode",
|
||||
"JobTimeoutAction",
|
||||
"JobTimeoutRebootArgument",
|
||||
"StartLimitAction",
|
||||
"FailureAction",
|
||||
"SuccessAction",
|
||||
"RebootArgument",
|
||||
"CollectMode"))
|
||||
if (STR_IN_SET(field,
|
||||
"Description", "SourcePath", "OnFailureJobMode",
|
||||
"JobTimeoutAction", "JobTimeoutRebootArgument",
|
||||
"StartLimitAction", "FailureAction", "SuccessAction",
|
||||
"RebootArgument", "CollectMode"))
|
||||
return bus_append_string(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "StopWhenUnneeded",
|
||||
"RefuseManualStart",
|
||||
"RefuseManualStop",
|
||||
"AllowIsolate",
|
||||
"IgnoreOnIsolate",
|
||||
"DefaultDependencies"))
|
||||
if (STR_IN_SET(field,
|
||||
"StopWhenUnneeded", "RefuseManualStart", "RefuseManualStop",
|
||||
"AllowIsolate", "IgnoreOnIsolate", "DefaultDependencies"))
|
||||
return bus_append_parse_boolean(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "JobTimeoutSec",
|
||||
"JobRunningTimeoutSec",
|
||||
"StartLimitIntervalSec"))
|
||||
if (STR_IN_SET(field, "JobTimeoutSec", "JobRunningTimeoutSec", "StartLimitIntervalSec"))
|
||||
return bus_append_parse_sec_rename(m, field, eq);
|
||||
|
||||
if (streq(field, "StartLimitBurst"))
|
||||
return bus_append_safe_atou(m, field, eq);
|
||||
|
||||
if (STR_IN_SET(field, "SuccessActionExitStatus",
|
||||
"FailureActionExitStatus")) {
|
||||
if (STR_IN_SET(field, "SuccessActionExitStatus", "FailureActionExitStatus")) {
|
||||
if (isempty(eq))
|
||||
r = sd_bus_message_append(m, "(sv)", field, "i", -1);
|
||||
else {
|
||||
|
|
@ -1800,8 +1653,7 @@ static int bus_append_unit_property(sd_bus_message *m, const char *field, const
|
|||
}
|
||||
|
||||
if (unit_dependency_from_string(field) >= 0 ||
|
||||
STR_IN_SET(field, "Documentation",
|
||||
"RequiresMountsFor"))
|
||||
STR_IN_SET(field, "Documentation", "RequiresMountsFor"))
|
||||
return bus_append_strv(m, field, eq, EXTRACT_UNQUOTE);
|
||||
|
||||
t = condition_type_from_string(field);
|
||||
|
|
|
|||
|
|
@ -227,8 +227,8 @@ static const char* const config_file[] = {
|
|||
"[Section]\n"
|
||||
"[Section]\n"
|
||||
"setting1=1\n"
|
||||
"setting1= 2 \t\n"
|
||||
"setting1= 1\n", /* repeated settings */
|
||||
"setting1=2\n"
|
||||
"setting1=1\n", /* repeated settings */
|
||||
|
||||
"[Section]\n"
|
||||
"[Section]\n"
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ static void test_config_parse_exec(void) {
|
|||
|
||||
log_info("/* no command, whitespace only, reset */");
|
||||
r = config_parse_exec(NULL, "fake", 3, "section", 1,
|
||||
"LValue", 0, "",
|
||||
"LValue", 0, " ",
|
||||
&c, u);
|
||||
assert_se(r == 0);
|
||||
assert_se(c == NULL);
|
||||
|
|
|
|||
|
|
@ -536,13 +536,7 @@ install_systemd() {
|
|||
|
||||
get_ldpath() {
|
||||
local _bin="$1"
|
||||
local rpath=$(objdump -p "$_bin" 2>/dev/null | awk "/R(UN)?PATH/ { print \"$initdir\" \$2 }" | paste -sd :)
|
||||
|
||||
if [ -z "$rpath" ] ; then
|
||||
echo $BUILD_DIR
|
||||
else
|
||||
echo $rpath
|
||||
fi
|
||||
objdump -p "$_bin" 2>/dev/null | awk "/R(UN)?PATH/ { print \"$initdir\" \$2 }" | paste -sd :
|
||||
}
|
||||
|
||||
install_missing_libraries() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue