shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 11:55:23 +03:00
Code

Merge pull request #8473 from keszybz/fix-dbus-reload

Browse Source 
Fix dbus reload. Fixes #8414.
This commit is contained in:
Yu Watanabe 2018-03-17 19:45:38 +09:00 committed by GitHub
commit a6d09d946b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/manager.c
View File

@ -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...");

7
src/core/unit.c
View File

@ -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)) {