* util/grub-mkrescue.in (make_image): Remove sh module, which has

been merged back into normal.

diff --git a/ChangeLog b/ChangeLog
index ab94151911ffcd01dd2d60496106455faa68a90c..1def7af01a732dd927a0c9051bd7c98ea87d3860 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-mkrescue.in (make_image): Remove sh module, which has
+       been merged back into normal.
+
 2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
 
        * include/grub/efi/uga_draw.h (GRUB_EFI_UGA_GLT_MAX): Rename to ...

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 61b0c94f7c49da5b7e90acb904f236a78a5c6c1a..ee269d692404c4c66c011884e0b14a5ab2a70b53 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -173,7 +173,7 @@ EOF
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
     $grub_mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
-        search iso9660 configfile normal sh memdisk tar $4
+        search iso9660 configfile normal memdisk tar $4
     rm -rf ${memdisk_img}
 }