service: simplify condition
The left side of the || expression is conditionalized on SERVICE_START, but SERVICE_START is blanket listed on the right side anyway, hence we can drop the left side entirely without any change in behaviour. Moreover, if main_pid is initialized, it should be watched, hence this is even the safe and right thing to do.
This commit is contained in:
parent
eabd3e56a6
commit
9acac21249
|
@ -1133,8 +1133,7 @@ static int service_coldplug(Unit *u) {
|
||||||
|
|
||||||
if (s->main_pid > 0 &&
|
if (s->main_pid > 0 &&
|
||||||
pid_is_unwaited(s->main_pid) &&
|
pid_is_unwaited(s->main_pid) &&
|
||||||
((s->deserialized_state == SERVICE_START && IN_SET(s->type, SERVICE_FORKING, SERVICE_DBUS, SERVICE_ONESHOT, SERVICE_NOTIFY)) ||
|
(IN_SET(s->deserialized_state,
|
||||||
IN_SET(s->deserialized_state,
|
|
||||||
SERVICE_START, SERVICE_START_POST,
|
SERVICE_START, SERVICE_START_POST,
|
||||||
SERVICE_RUNNING, SERVICE_RELOAD,
|
SERVICE_RUNNING, SERVICE_RELOAD,
|
||||||
SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
|
SERVICE_STOP, SERVICE_STOP_SIGABRT, SERVICE_STOP_SIGTERM, SERVICE_STOP_SIGKILL, SERVICE_STOP_POST,
|
||||||
|
|
Loading…
Reference in New Issue