diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-08-18 13:15:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-18 13:15:14 +0000 |
commit | cd7ad0cbde507b9b43cf7e1797ce75e98345f4a0 (patch) | |
tree | 387b38db43b4acbbb91158a1bc59002e0f91bf66 /src/sulogin-shell/sulogin-shell.c | |
parent | 0a152619aca5b6c16d022cc3e6ab2fc3786d0284 (diff) | |
parent | db5276215ae496074c163fca4014baf1bcd05984 (diff) | |
download | systemd-cd7ad0cbde507b9b43cf7e1797ce75e98345f4a0.tar.gz |
Merge pull request #24054 from keszybz/initrd-no-reload
Don't do daemon-reload in the initrd
Diffstat (limited to 'src/sulogin-shell/sulogin-shell.c')
-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 06f17c6a8e..5648dfd83b 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -33,11 +33,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)); |