picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4447 from poettering/oneshotassertfix

Browse source 
core: if the start command vanishes during runtime don't hit an assert
This commit is contained in:
Daniel Mack 2016-10-21 16:22:15 +02:00 committed by GitHub
parent 6fa441140e 47fffb3530
commit 5138a901b1
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/service.c
View file

@ -1756,7 +1756,15 @@ static void service_enter_start(Service *s) {
}
if (!c) {
assert(s->type == SERVICE_ONESHOT);
if (s->type != SERVICE_ONESHOT) {
/* There's no command line configured for the main command? Hmm, that is strange. This can only
* happen if the configuration changes at runtime. In this case, let's enter a failure
* state. */
log_unit_error(UNIT(s), "There's no 'start' task anymore we could start: %m");
r = -ENXIO;
goto fail;
}
service_enter_start_post(s);
return;
}