From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jun 2010 11:02:38 +0000 (+0100)
Subject: * util/grub-mkrescue.in (make_image): Remove sh module, which has
X-Git-Tag: 1.99~825
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee62c427e51eb267ccc0e69823c1bb05ca75e2d6;p=thirdparty%2Fgrub.git

* util/grub-mkrescue.in (make_image): Remove sh module, which has
been merged back into normal.
---

diff --git a/ChangeLog b/ChangeLog
index ab9415191..1def7af01 100644
--- 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 61b0c94f7..ee269d692 100644
--- 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}
 }