Skip to content

Commit

Permalink
x86, efi: Allow slash in file path of initrd
Browse files Browse the repository at this point in the history
When initrd file didn't put at the same place with stub kernel, we
need give the file path of initrd, but need use backslash to separate
directory and file. It's not friendly to unix/linux user, and not so
intuitive for bootloader forward paramters to efi stub kernel by
chainloading.

This patch add support to handle_ramdisks for allow slash in file path
of initrd, it convert slash to backlash when parsing path.

In additional, this patch also separates print code of efi_char16_t from
efi_printk, and print out the path/filename of initrd when failed to open
initrd file. It's good for debug and discover typo.

Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Lee, Chun-Yi authored and Matt Fleming committed Jan 31, 2013
1 parent 04c2eee commit deb9410
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions arch/x86/boot/compressed/eboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,28 @@

static efi_system_table_t *sys_table;

static void efi_char16_printk(efi_char16_t *str)
{
struct efi_simple_text_output_protocol *out;

out = (struct efi_simple_text_output_protocol *)sys_table->con_out;
efi_call_phys2(out->output_string, out, str);
}

static void efi_printk(char *str)
{
char *s8;

for (s8 = str; *s8; s8++) {
struct efi_simple_text_output_protocol *out;
efi_char16_t ch[2] = { 0 };

ch[0] = *s8;
out = (struct efi_simple_text_output_protocol *)sys_table->con_out;

if (*s8 == '\n') {
efi_char16_t nl[2] = { '\r', 0 };
efi_call_phys2(out->output_string, out, nl);
efi_char16_printk(nl);
}

efi_call_phys2(out->output_string, out, ch);
efi_char16_printk(ch);
}
}

Expand Down Expand Up @@ -709,7 +714,12 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
if ((u8 *)p >= (u8 *)filename_16 + sizeof(filename_16))
break;

*p++ = *str++;
if (*str == '/') {
*p++ = '\\';
*str++;
} else {
*p++ = *str++;
}
}

*p = '\0';
Expand Down Expand Up @@ -737,7 +747,9 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
status = efi_call_phys5(fh->open, fh, &h, filename_16,
EFI_FILE_MODE_READ, (u64)0);
if (status != EFI_SUCCESS) {
efi_printk("Failed to open initrd file\n");
efi_printk("Failed to open initrd file: ");
efi_char16_printk(filename_16);
efi_printk("\n");
goto close_handles;
}

Expand Down

0 comments on commit deb9410

Please sign in to comment.