Merge pull request #14166 from keszybz/transient-unit-settings

Fix docs and some transient unit property passing
test-functions: make sure we use the right library path for binaries without RPATH
2019-11-28 17:23:30 +09:00 · 2019-11-28 09:20:40 +01:00 · 2019-11-28 08:58:29 +01:00 · 2019-11-27 13:56:29 +01:00 · 2019-11-27 13:56:29 +01:00 · 2019-11-27 13:56:28 +01:00
9 changed files with 387 additions and 220 deletions
--- a/docs/TRANSIENT-SETTINGS.md
+++ b/docs/TRANSIENT-SETTINGS.md
@ -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, 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.
+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.

 The lists below contain all settings currently available in unit files. The
 ones currently available in transient units are prefixed with `✓`.
@ -44,15 +44,14 @@ Most generic unit settings are available for transient units.
 ✓ JobRunningTimeoutSec=
 ✓ JobTimeoutAction=
 ✓ JobTimeoutRebootArgument=
-✓ StartLimitIntervalSec=SECONDS
-✓ StartLimitBurst=UNSIGNED
-✓ StartLimitAction=ACTION
+✓ StartLimitIntervalSec=
+✓ StartLimitBurst=
+✓ StartLimitAction=
 ✓ FailureAction=
 ✓ SuccessAction=
 ✓ FailureActionExitStatus=
 ✓ SuccessActionExitStatus=
-✓ AddRef=
-✓ RebootArgument=STRING
+✓ RebootArgument=
 ✓ ConditionPathExists=
 ✓ ConditionPathExistsGlob=
 ✓ ConditionPathIsDirectory=
@ -185,6 +184,7 @@ All execution-related settings are available for transient units.
 ✓ PrivateMounts=
 ✓ ProtectKernelTunables=
 ✓ ProtectKernelModules=
+✓ ProtectKernelLogs=
 ✓ ProtectControlGroups=
 ✓ PrivateNetwork=
 ✓ PrivateUsers=
@ -271,6 +271,7 @@ All process killing settings are available for transient units:
 ✓ SendSIGHUP=
 ✓ KillMode=
 ✓ KillSignal=
+✓ RestartKillSignal=
 ✓ FinalKillSignal=
 ✓ WatchdogSignal=
 ```
@ -310,6 +311,7 @@ Most service unit settings are available for transient units.
  Sockets=
 ✓ USBFunctionDescriptors=
 ✓ USBFunctionStrings=
+✓ OOMPolicy=
 ```

 ## Mount Unit Settings
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@ -309,6 +309,13 @@ 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);

--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@ -614,7 +614,6 @@ int config_parse_exec(
        assert(e);

        e += ltype;
-        rvalue += strspn(rvalue, WHITESPACE);

        if (isempty(rvalue)) {
                /* An empty assignment resets the list */
@ -1931,6 +1930,40 @@ 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,
@ -1946,24 +1979,12 @@ int config_parse_service_timeout_abort(
        Service *s = userdata;
        int r;

-        assert(filename);
-        assert(lvalue);
-        assert(rvalue);
        assert(s);

-        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;
+        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;
        return 0;
 }

@ -4981,39 +5002,3 @@ 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;
-}
--- a/src/core/main.c
+++ b/src/core/main.c
@ -539,8 +539,27 @@ 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 parse_config_file(void) {
+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                                   },
@ -573,7 +592,7 @@ static int parse_config_file(void) {
                { "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", "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      },
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@ -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;
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@ -421,18 +421,26 @@ 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;
@ -448,7 +456,8 @@ 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"))
@ -593,7 +602,8 @@ 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 {
@ -653,7 +663,8 @@ 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;
@ -773,7 +784,8 @@ 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
@ -805,31 +817,68 @@ 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"))
@ -841,7 +890,8 @@ 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"))
@ -856,9 +906,12 @@ 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"))
@ -873,7 +926,9 @@ 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")) {
@ -925,7 +980,9 @@ 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:"))) {
@ -997,7 +1054,8 @@ 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;

@ -1013,7 +1071,8 @@ 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;
@ -1080,7 +1139,8 @@ 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;

@ -1178,7 +1238,8 @@ 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");
@ -1330,10 +1391,14 @@ 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;
@ -1341,7 +1406,10 @@ 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"))
@ -1350,7 +1418,9 @@ 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;
@ -1365,9 +1435,11 @@ 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
@ -1383,11 +1455,9 @@ 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;
@ -1396,15 +1466,28 @@ 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", "RuntimeMaxSec", "WatchdogSec"))
+        if (STR_IN_SET(field, "RestartSec",
+                              "TimeoutStartSec",
+                              "TimeoutStopSec",
+                              "TimeoutAbortSec",
+                              "RuntimeMaxSec",
+                              "WatchdogSec"))
                return bus_append_parse_sec_rename(m, field, eq);

        if (streq(field, "TimeoutSec")) {
@ -1418,14 +1501,25 @@ 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;
@ -1512,39 +1606,70 @@ 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"))
@ -1553,9 +1678,14 @@ 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
@ -1571,16 +1701,22 @@ 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 {
@ -1616,25 +1752,36 @@ 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 {
@ -1653,7 +1800,8 @@ 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);
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@ -227,7 +227,7 @@ static const char* const config_file[] = {
        "[Section]\n"
        "[Section]\n"
        "setting1=1\n"
-        "setting1=2\n"
+        "setting1=    2 \t\n"
        "setting1=    1\n",  /* repeated settings */

        "[Section]\n"
--- a/test/test-functions
+++ b/test/test-functions
@ -536,7 +536,13 @@ install_systemd() {

 get_ldpath() {
    local _bin="$1"
-    objdump -p "$_bin" 2>/dev/null | awk "/R(UN)?PATH/ { print \"$initdir\" \$2 }" | paste -sd :
+    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
 }

 install_missing_libraries() {
Author	SHA1	Message	Date
Yu Watanabe	d2a56598d0	Merge pull request #14166 from keszybz/transient-unit-settings Fix docs and some transient unit property passing	2019-11-28 17:23:30 +09:00
Lennart Poettering	5bb4503d3a	test-functions: make sure we use the right library path for binaries without RPATH Meson appears to set the rpath only for some binaries it builds, but not all. (The rules are not clear to me, but that's besides the point of this commit). Let's make sure if our test script operates on a binary that has no rpath set we fall back preferably to the BUILD_DIR rather than directly to the host. This matters if a test uses a libsystemd symbol introduced in a version newer than the one on the host. In that case "ldd" will not work on the test binary if rpath is not set. With this fix that behaviour is corrected, and "ldd" works correctly even in this case. (Or in other words: before this fix on binaries lacking rpath we'd base dependency info on the libraries of the host, not the buidl tree, if they exist in both.)	2019-11-28 09:20:40 +01:00
Kevin Kuehler	6da498c28f	shared/ask-password-api: modify keyctl break value We can break if KEYCTL_READ return value is equal to our buffer size. From keyctl(2): On a successful return, the return value is always the total size of the payload data. To determine whether the buffer was of sufficient size, check to see that the return value is less than or equal to the value supplied in arg4.	2019-11-28 08:58:29 +01:00
Zbigniew Jędrzejewski-Szmek	b096d14c41	doc: update list of transient units Doing this manually seem to work only so well, but it is indeed hard to generate automatically. Let's add the stuff that is missing for now. AddRef= is not a unit file setting, remove it from the list.	2019-11-27 13:56:29 +01:00
Zbigniew Jędrzejewski-Szmek	e737017b85	pid1: make TimeoutAbortSec settable for transient units It was documented to be, but implementation was missing.	2019-11-27 13:56:29 +01:00
Zbigniew Jędrzejewski-Szmek	a61d68748a	pid1: fix setting of DefaultTimeoutAbortSec This partially reverts `a07a7324ad`. We have two pieces of information: the value and a boolean. config_parse_timeout_abort() added in the reverted commit would write the boolean to the usec_t value, making a mess. The code is reworked to have just one implementation and two wrappers which pass two pointers.	2019-11-27 13:56:28 +01:00
Zbigniew Jędrzejewski-Szmek	b9d9fbe411	shared/conf-parser: remove unnecessary whitespace skipping The conf-parser machinery already removed whitespace before and after "=", no need to repeat this step. The test is adjusted to pass. It was testing an code path that doesn't happen normally, no point in doing that.	2019-11-27 13:56:28 +01:00
Zbigniew Jędrzejewski-Szmek	c57d2a76c5	shared/bus-unit-util: word wrap Having all the names squished on the same line makes it hard to see what settings are missing.	2019-11-27 13:56:28 +01:00
Zbigniew Jędrzejewski-Szmek	370f0dc81c	doc: drop rhs from transient settings list I don't know why these particular ones had them.	2019-11-27 11:04:36 +01:00