diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-07-22 22:29:00 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-07-22 22:34:20 +0200 |
commit | 5df2a4a6e0b3e8574e067d0252b954a5e002e751 (patch) | |
tree | 34b95ab240ea54a1bdf0d3c4ae453cfc0277e38d /src/sulogin-shell | |
parent | 6ce4de290fe4add778ef6cc778b8abd6af21471f (diff) | |
download | systemd-5df2a4a6e0b3e8574e067d0252b954a5e002e751.tar.gz |
Use a common define for the reload timeout
Diffstat (limited to 'src/sulogin-shell')
-rw-r--r-- | src/sulogin-shell/sulogin-shell.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index 148e8acd73..718cf37607 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -34,11 +34,8 @@ static int reload_manager(sd_bus *bus) { if (r < 0) return bus_log_create_error(r); - /* Note we use an extra-long timeout here. This is because a reload or reexec means generators are rerun which - * are timed out after DEFAULT_TIMEOUT_USEC. Let's use twice that time here, so that the generators can have - * their timeout, and for everything else there's the same time budget in place. */ - - r = sd_bus_call(bus, m, DEFAULT_TIMEOUT_USEC * 2, &error, NULL); + /* Reloading the daemon may take long, hence set a longer timeout here */ + r = sd_bus_call(bus, m, DAEMON_RELOAD_TIMEOUT_SEC, &error, NULL); if (r < 0) return log_error_errno(r, "Failed to reload daemon: %s", bus_error_message(&error, r)); |