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

systemctl: add error message when we get unexpected event from waitid() 

We should log about everything we don't expect.

Also, add a comment for one case were we do not log, on purpose, and make it
use a separate error code.
This commit is contained in:
Lennart Poettering 2016-04-07 17:41:48 +02:00
parent cc7cb0ca90
commit c61b443d32
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/systemctl/systemctl.c
View File

@ -5340,9 +5340,11 @@ static int enable_sysv_units(const char *verb, char **args) {
}
} else if (status.si_status != 0)
return -EINVAL;
} else
return -EBADE; /* We don't warn here, under the assumption the script already showed an explanation */
} else {
log_error("Unexpected waitid() result.");
return -EPROTO;
}
if (found_native)
continue;
@ -5413,8 +5415,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
if (r < 0)
return r;
/* If the operation was fully executed by the SysV compat,
* let's finish early */
/* If the operation was fully executed by the SysV compat, let's finish early */
if (strv_isempty(names))
return 0;