From ceb728cf0fdfb6543f40b862525319a084332dfc Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Mon, 19 Oct 2015 21:57:01 +0200 Subject: Hook more properties for transient units systemd-run can now launch units with EnvironmentFile set. --- src/core/dbus-execute.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'src/core') diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 2662b07525..b71e5ad300 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1204,6 +1204,77 @@ int bus_exec_context_set_transient_property( return 1; + } else if (streq(name, "EnvironmentFiles")) { + + _cleanup_free_ char *joined = NULL; + _cleanup_fclose_ FILE *f = NULL; + size_t size = 0; + bool empty_array = true; + + r = sd_bus_message_enter_container(message, 'a', "(sb)"); + if (r < 0) + return r; + + f = open_memstream(&joined, &size); + if (!f) + return -ENOMEM; + + if (mode != UNIT_CHECK) { + char **buf; + STRV_FOREACH(buf, c->environment_files) + fprintf(f, "EnvironmentFile=%s\n", *buf); + } + + while ((r = sd_bus_message_enter_container(message, 'r', "sb")) > 0) { + const char *path; + int b; + + empty_array = false; + + r = sd_bus_message_read(message, "sb", &path, &b); + if (r < 0) + return r; + + r = sd_bus_message_exit_container(message); + if (r < 0) + return r; + + if (!isempty(path) && !path_is_absolute(path)) + return sd_bus_error_set_errnof(error, EINVAL, "Path %s is not absolute.", path); + + if (mode != UNIT_CHECK) { + _cleanup_free_ char *drop_in = NULL; + char *buf = NULL; + + buf = strjoin(b ? "-" : "", path, NULL); + if (buf == NULL) + return -ENOMEM; + + fprintf(f, "EnvironmentFile=%s\n", buf); + + r = strv_consume(&c->environment_files, buf); + if (r < 0) + return r; + } + } + if (r < 0) + return r; + + fflush(f); + + if (mode != UNIT_CHECK) + if (empty_array) { + strv_clear(c->environment_files); + unit_write_drop_in_private(u, mode, name, "EnvironmentFile=\n"); + } else + unit_write_drop_in_private(u, mode, name, joined); + + r = sd_bus_message_exit_container(message); + if (r < 0) + return r; + + return 1; + } else if (rlimit_from_string(name) >= 0) { uint64_t rl; rlim_t x; -- cgit v1.2.3-54-g00ecf