mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-28 11:55:23 +03:00
Merge pull request #8473 from keszybz/fix-dbus-reload
Fix dbus reload. Fixes #8414.
This commit is contained in:
commit
a6d09d946b
@ -2334,8 +2334,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
|
||||
|
||||
case SIGTERM:
|
||||
if (MANAGER_IS_SYSTEM(m)) {
|
||||
/* This is for compatibility with the
|
||||
* original sysvinit */
|
||||
/* This is for compatibility with the original sysvinit */
|
||||
r = verify_run_space_and_log("Refusing to reexecute");
|
||||
if (r >= 0)
|
||||
m->exit_code = MANAGER_REEXECUTE;
|
||||
@ -2352,21 +2351,20 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
|
||||
break;
|
||||
|
||||
case SIGWINCH:
|
||||
/* This is a nop on non-init */
|
||||
if (MANAGER_IS_SYSTEM(m))
|
||||
manager_start_target(m, SPECIAL_KBREQUEST_TARGET, JOB_REPLACE);
|
||||
|
||||
/* This is a nop on non-init */
|
||||
break;
|
||||
|
||||
case SIGPWR:
|
||||
/* This is a nop on non-init */
|
||||
if (MANAGER_IS_SYSTEM(m))
|
||||
manager_start_target(m, SPECIAL_SIGPWR_TARGET, JOB_REPLACE);
|
||||
|
||||
/* This is a nop on non-init */
|
||||
break;
|
||||
|
||||
case SIGUSR1:
|
||||
|
||||
if (manager_dbus_is_running(m, false)) {
|
||||
log_info("Trying to reconnect to bus...");
|
||||
|
||||
|
@ -2501,8 +2501,11 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
|
||||
}
|
||||
}
|
||||
|
||||
manager_recheck_journal(m);
|
||||
manager_recheck_dbus(m);
|
||||
if (!MANAGER_IS_RELOADING(u->manager)) {
|
||||
manager_recheck_journal(m);
|
||||
manager_recheck_dbus(m);
|
||||
}
|
||||
|
||||
unit_trigger_notify(u);
|
||||
|
||||
if (!MANAGER_IS_RELOADING(u->manager)) {
|
||||
|
Loading…
Reference in New Issue
Block a user