"systemctl daemon-reload" should also update the manager defaults from
/etc/systemd/system.conf.
For details, see:
http://lists.freedesktop.org/archives/systemd-devel/2015-June/033062.html
Regards
Thomas Blume
--
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu, Graham
Norton, HRB 21284 (AG Nürnberg)
Maxfeldstr. 5 / D-90409 Nürnberg / Phone: +49-911-740 53 - 0 / VOIP: 3919
GPG 2048R/2CD4D3E8 9A50 048F 1C73 59AA 4D2E 424E B3C6 3FD9 2CD4 D3E8
From f4caa8b44c1596b44723d0ffdff098916b2e0264 Mon Sep 17 00:00:00 2001
From: Thomas Blume <[email protected]>
Date: Tue, 23 Jun 2015 14:39:04 +0200
Subject: [PATCH] Reload manager defaults at daemon-reload
"systemctl daemon-reload" should also update the manager defaults from
/etc/systemd/system.conf.
For details, see:
http://lists.freedesktop.org/archives/systemd-devel/2015-June/033062.html
---
src/core/main.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/src/core/main.c b/src/core/main.c
index 332453a..16c19b1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -685,6 +685,29 @@ static int parse_config_file(void) {
return 0;
}
+static int reload_manager_defaults(Manager *m) {
+ int r;
+
+ assert(m);
+
+ r = parse_config_file();
+ if (r < 0)
+ return r;
+
+ m->default_std_output = arg_default_std_output;
+ m->default_std_error = arg_default_std_error;
+ m->default_timeout_start_usec = arg_default_timeout_start_usec;
+ m->default_timeout_stop_usec = arg_default_timeout_stop_usec;
+ m->default_restart_usec = arg_default_restart_usec;
+ m->default_start_limit_interval = arg_default_start_limit_interval;
+ m->default_start_limit_burst = arg_default_start_limit_burst;
+
+ manager_set_default_rlimits(m, arg_default_rlimit);
+ manager_environment_add(m, NULL, arg_default_environment);
+
+ return 0;
+}
+
static int parse_argv(int argc, char *argv[]) {
enum {
@@ -1763,6 +1786,11 @@ int main(int argc, char *argv[]) {
case MANAGER_RELOAD:
log_info("Reloading.");
+
+ r = reload_manager_defaults(m);
+ if (r < 0)
+ log_error("Failed to reload manager defaults: %s", strerror(-r));
+
r = manager_reload(m);
if (r < 0)
log_error_errno(r, "Failed to reload: %m");
--
2.1.4
_______________________________________________
systemd-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
