From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 8 Aug 2010 14:27:58 +0000 (+0200)
Subject: 2010-08-08  Robert Millan  <rmh@gnu.org>
X-Git-Tag: 1.99~679
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d8286f32816067967817eceade37e5924b16c5d;p=thirdparty%2Fgrub.git

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 65120fc25..df8d040fd 100644
--- 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 29737f990..3a42de529 100644
--- 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