* util/grub-mkrescue.in: Fix incorrect path in coreboot part.

	Reported by: Thomas Schmitt.
	Add -no-emul-boot to grub-mkisofs parameters.

diff --git a/ChangeLog b/ChangeLog
index d6cdfdbe802698ecb5ca85db3cc620309004ca29..a2a33b2ef3746d073e682d5e6c7d366d3421cdfd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkrescue.in: Fix incorrect path in coreboot part.
+       Reported by: Thomas Schmitt.
+       Add -no-emul-boot to grub-mkisofs parameters.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * font/font.c: Indented.

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index db29b08991515fda8e8f0d1d2e9b0c84896c3253..aafdfb059694932a4ce4ea12c4f697d2e41b6b23 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -156,7 +156,7 @@ EOF
         echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg
+    > ${iso9660_dir}/boot/grub/i386-coreboot/grub.cfg
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
@@ -187,7 +187,7 @@ if test -e "${pc_dir}" ; then
     echo "source /boot/grub/grub.cfg") \
     > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg
 
-    grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -boot-info-table \
+    grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -no-emul-boot -boot-info-table \
                --embedded-boot ${embed_img}"
 fi