diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-06 11:02:04 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-06 11:02:04 +0200 |
| commit | 6c8fe330317c159fff33ed8cce8d55a195a9445e (patch) | |
| tree | c2489c18003b6c9ac915d5d9a4c7b36765689ec8 /src/core | |
| parent | c51abd80cf774815f57817da527639081d7002f4 (diff) | |
| parent | 95c906ae0727123e45a9d88782133cac4554ddcd (diff) | |
Merge pull request #1452 from poettering/journal-vacuum
A variety of journal vacuuming improvements, plus an nspawn fix
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/service.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/service.c b/src/core/service.c index cb0394f930..3bb0d913b4 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -884,7 +884,6 @@ static void service_set_state(Service *s, ServiceState state) { log_unit_debug(UNIT(s), "Changed %s -> %s", service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), table[old_state], table[state], s->reload_result == SERVICE_SUCCESS); - s->reload_result = SERVICE_SUCCESS; } static int service_coldplug(Unit *u) { @@ -1778,6 +1777,7 @@ static void service_enter_reload(Service *s) { assert(s); service_unwatch_control_pid(s); + s->reload_result = SERVICE_SUCCESS; s->control_command = s->exec_command[SERVICE_EXEC_RELOAD]; if (s->control_command) { |