2010-08-08 Robert Millan <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: When files required for ZFS do not
	exist, issue a proper error message (rely on `ls' for translated
	strings).

diff --git a/ChangeLog b/ChangeLog
index 65120fc25cefcc1c63d5883c68ab895cb3d7b3da..df8d040fd57674381a9f2a510d9d56bd24523e35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+       * util/grub.d/10_kfreebsd.in: When files required for ZFS do not
+       exist, issue a proper error message (rely on `ls' for translated
+       strings).
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
        Fix grub-probe invocation.

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 29737f990355ea2ae767e611736cf467ad45d789..3a42de529dfeae8f113836afda3a5c7a1a0e9129 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -76,9 +76,10 @@ EOF
 
   case "${kfreebsd_fs}" in
     zfs)
-      test -e "${module_dir}/opensolaris.ko"
-      test -e "${module_dir}/zfs.ko"
-      test -e "${dirname}/zfs/zpool.cache"
+      for i in "${module_dir}/opensolaris.ko" "${module_dir}/zfs.ko" \
+          "${dirname}/zfs/zpool.cache" ; do
+        ls "$i" > /dev/null
+      done
 
       printf '%s\n' "${prepare_module_dir_cache}"
       cat << EOF