SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/import-creds: use proc_cmdline_get_bool()

Browse Source
This commit is contained in:
Mike Yuan
2024-07-13 22:58:23 +02:00
parent 497b17bbad
commit efa7a5cfe4
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/import-creds.c
+6 -11
View File
@@ -880,19 +880,14 @@ int import_credentials(void) {
RET_GATHER(r, merge_credentials_trusted(received_creds_dir));
} else {
_cleanup_free_ char *v = NULL;
bool import;
r = proc_cmdline_get_key("systemd.import_credentials", PROC_CMDLINE_STRIP_RD_PREFIX, &v);
r = proc_cmdline_get_bool("systemd.import_credentials", PROC_CMDLINE_STRIP_RD_PREFIX|PROC_CMDLINE_TRUE_WHEN_MISSING, &import);
if (r < 0)
log_debug_errno(r, "Failed to check if 'systemd.import_credentials=' kernel command line option is set, ignoring: %m");
else if (r > 0) {
r = parse_boolean(v);
if (r < 0)
log_debug_errno(r, "Failed to parse 'systemd.import_credentials=' parameter, ignoring: %m");
else if (r == 0) {
log_notice("systemd.import_credentials=no is set, skipping importing of credentials.");
return 0;
}
log_debug_errno(r, "Failed to check systemd.import_credentials= kernel command line option, proceeding: %m");
else if (!import) {
log_notice("systemd.import_credentials=no is set, skipping importing of credentials.");
return 0;
}
r = import_credentials_boot();