merge with mainline

2010-08-19 16:54:00 +05:30 · 2010-08-19 16:54:00 +05:30 · 16c7cb32c8
commit 16c7cb32c8
parent 7afdce98a6 51f1f5afab
80 changed files with 5101 additions and 1687 deletions
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@ -296,6 +296,7 @@ if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then

    mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
    mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
+    rm -rf ${efi_dir}
    grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi