merge mainline into install

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-09-08 15:05:42 +02:00
commit 6ed71f4831
135 files changed
+7695 -1076

No files matched your search

+1
View File
@@ -69,6 +69,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
grub_dl_ref (my_mod);
grub_file_filter_disable_compression ();
file = grub_file_open (filename);
if (! file)
goto fail;
+1
View File
@@ -401,6 +401,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
addr_min = GRUB_LINUX_BZIMAGE_ADDR + grub_linux16_prot_size;
grub_file_filter_disable_compression ();
file = grub_file_open (argv[0]);
if (!file)
goto fail;