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

vmspawn: simplify kernel_cmdline_maybe_append_root()

Browse Source
This commit is contained in:
Lennart Poettering
2026-04-02 23:28:33 +02:00
parent 275e31f44c
commit 7f5bea5b78
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vmspawn/vmspawn.c
+10 -12
View File
@@ -1876,22 +1876,20 @@ static int bind_user_setup(
static int kernel_cmdline_maybe_append_root(void) {
int r;
bool cmdline_contains_root = strv_find_startswith(arg_kernel_cmdline_extra, "root=")
|| strv_find_startswith(arg_kernel_cmdline_extra, "mount.usr=");
if (!cmdline_contains_root) {
_cleanup_free_ char *root = NULL;
if (strv_find_startswith(arg_kernel_cmdline_extra, "root=") ||
strv_find_startswith(arg_kernel_cmdline_extra, "mount.usr="))
return 0;
r = discover_root(&root);
if (r < 0)
return r;
_cleanup_free_ char *root = NULL;
r = discover_root(&root);
if (r < 0)
return r;
log_debug("Determined root file system %s from dissected image", root);
log_debug("Determined root file system '%s' from dissected image", root);
r = strv_consume(&arg_kernel_cmdline_extra, TAKE_PTR(root));
if (r < 0)
return log_oom();
}
if (strv_consume(&arg_kernel_cmdline_extra, TAKE_PTR(root)) < 0)
return log_oom();
return 0;
}