Skip to content

Fix incorrect condition in initramfs_tool_helper() path argument handling #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkeven wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect condition in initramfs_tool_helper() path argument handling #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions initramfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,15 +364,16 @@ static int initramfs_tool_helper(Options *op, int tool, const char *kernel,
}

/* Build initramfs file path specific command line arguments */
if (path && initramfs_tools[tool].path_specific_args) {
if (!initramfs_tools[tool].path_specific_args) {
if (path) {
if (initramfs_tools[tool].path_specific_args) {
path_args = nvstrcat(initramfs_tools[tool].path_specific_args, " ",
path, NULL);
} else {
ui_log(op, "%s does not take a path argument.", tool_path);
goto done;
}
path_args = nvstrcat(initramfs_tools[tool].path_specific_args, " ",
path, NULL);
} else {
if (initramfs_tools[tool].requires_path || !path) {
if (initramfs_tools[tool].requires_path) {
ui_log(op, "%s requires a file path argument, but none was given.",
tool_path);
goto done;
Expand Down