Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

This commit is contained in:
Vladimir Serbinenko 2013-11-18 16:47:54 +01:00
commit 1bbb796799
2 changed files with 5 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2013-11-18 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkrescue.c (main): Fix typo.
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/mips/qemu_mips/init.c (grub_machine_init): Update

View file

@ -388,8 +388,7 @@ main (int argc, char *argv[])
xorriso_push ("-graft-points");
iso9660_dir = grub_util_make_temporary_dir ();
grub_util_info ("temporaray iso9660 dir is `%s'",
iso9660_dir);
grub_util_info ("temporary iso9660 dir is `%s'", iso9660_dir);
boot_grub = grub_util_path_concat (3, iso9660_dir, "boot", "grub");
grub_install_mkdir_p (boot_grub);
romdir = grub_util_path_concat (2, boot_grub, "roms");