diff --git a/man/systemd-pcrlock.xml b/man/systemd-pcrlock.xml index 3c4d9bb0e7a..f82268c6758 100644 --- a/man/systemd-pcrlock.xml +++ b/man/systemd-pcrlock.xml @@ -462,15 +462,15 @@ point in the sorted list of defined components to analyze/predict PCRs to. Typically, the systemd-pcrlock tool is invoked from a fully booted system after boot-up and before shutdown. This means various components that are defined for shutdown have not been measured - yet, and should not be searched for. This option allows to restrict which components are considered - for analysis (taking only components before some point into account, ignoring components after - them). The expected string is ordered against the filenames of the components defined. Any components - with a lexicographically later name are ignored. This logic applies to the log, - predict, and make-policy verbs. If a colon-separated pair of - strings are specified then they select which phases of the boot to include in the - prediction/policy. The first string defines where the first prediction shall be made, and the second - string defines where the last prediction shall be made. All such predictions are then combined into - one set. + yet, and should not be searched for. This option allows one to restrict which components are + considered for analysis (taking only components before some point into account, ignoring components + after them). The expected string is ordered against the filenames of the components defined. Any + components with a lexicographically later name are ignored. This logic applies to the + log, predict, and make-policy verbs. If a + colon-separated pair of strings are specified then they select which phases of the boot to include + in the prediction/policy. The first string defines where the first prediction shall be made, and the + second string defines where the last prediction shall be made. All such predictions are then combined + into one set. If used with list-components the selected location range will be highlighted in the component list. diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c index 1d0b8548e33..67a30053251 100644 --- a/src/udev/udev-spawn.c +++ b/src/udev/udev-spawn.c @@ -227,7 +227,7 @@ int udev_event_spawn( bool accept_failure, const char *cmd, char *result, - size_t ressize, + size_t result_size, bool *ret_truncated) { _cleanup_close_pair_ int outpipe[2] = EBADF_PAIR, errpipe[2] = EBADF_PAIR; @@ -239,7 +239,7 @@ int udev_event_spawn( assert(event); assert(event->dev); - assert(result || ressize == 0); + assert(result || result_size == 0); /* pipes from child to parent */ if (result || log_get_max_level() >= LOG_INFO) @@ -307,7 +307,7 @@ int udev_event_spawn( .fd_stdout = outpipe[READ_END], .fd_stderr = errpipe[READ_END], .result = result, - .result_size = ressize, + .result_size = result_size, }; r = spawn_wait(&spawn); if (r < 0)