Skip to content

grub-mkstandalone: reduce sharp edges #148

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
wants to merge 1 commit into
base: fedora-39
Choose a base branch
from
Open

grub-mkstandalone: reduce sharp edges #148

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
10 changes: 6 additions & 4 deletions util/grub-mkstandalone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ argp_parser (int key, char *arg, struct argp_state *state)

struct argp argp = {
options, argp_parser, N_("[OPTION] SOURCE..."),
N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub/grub.cfg=./grub.cfg) is accepted"),
N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub/grub.cfg=./grub.cfg) is accepted. The path on the right must point to a regular file."),
NULL, help_filter, NULL
};

Expand Down Expand Up @@ -189,8 +189,10 @@ add_tar_file (const char *from,

COMPILE_TIME_ASSERT (sizeof (hd) == 512);

if (grub_util_is_special_file (from))
return;
if (grub_util_is_special_file (from)) {
grub_util_warn (_("skip: %s is not a regular file"), from);
return;
}

mtime = grub_util_get_mtime (from);

Expand Down Expand Up @@ -273,7 +275,7 @@ add_tar_file (const char *from,
compute_checksum (&hd);

fwrite (&hd, 1, sizeof (hd), memdisk);

while (1)
{
r = grub_util_fd_read (in, grub_install_copy_buffer, GRUB_INSTALL_COPY_BUFFER_SIZE);
Expand Down