1
0
mirror of https://github.com/systemd/systemd synced 2026-03-28 09:44:50 +01:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Antonio Álvarez Feijoo
4ae16cf9b7
kernel-install: exit with option --json=help (#39974)
In that case, `parse_json_argument()` returns 0.

Follow-up for bdd36c003d9c4c4ca89c92be504615378f61513c (v255).
2025-12-03 01:56:01 +09:00
Luca Boccassi
ce3acf9acb cryptsetup: downgrade dlopen not compiled message to debug
Every other log in this function is debug level, so downgrade this too.
Otherwise compiling without libcryptsetup means sd-executor logs at
error level when starting any service, regardless of whether it is
needed or not.

Fixes https://github.com/systemd/systemd/issues/39968

Follow-up for efaf5a763d6a06645dba8e88ebc15e887d59cbef
2025-12-02 16:52:24 +00:00
2 changed files with 2 additions and 2 deletions

View File

@ -1621,7 +1621,7 @@ static int parse_argv(int argc, char *argv[], Context *c) {
case ARG_JSON: case ARG_JSON:
r = parse_json_argument(optarg, &arg_json_format_flags); r = parse_json_argument(optarg, &arg_json_format_flags);
if (r < 0) if (r <= 0)
return r; return r;
break; break;

View File

@ -298,7 +298,7 @@ int dlopen_cryptsetup(void) {
return 1; return 1;
#else #else
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in."); return log_debug_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in.");
#endif #endif
} }