* util/grub.d/10_linux.in: Fix ZFS root passing.

diff --git a/ChangeLog b/ChangeLog
index 6cc05e14cf58574680b098b651c7a3a261a88a3e..967218825aeebd25cc1f359b7418cfaad3ceafd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-10  Richard Laager <rlaager@wiktel.com>
+
+       * util/grub.d/10_linux.in: Fix ZFS root passing.
+
 2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/videoinfo.c: Add TRANSLATORS comments.

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index f5d8a24062bbcc22b3748823dccdf751e936f72c..da210539d391d5a2f95028df296844a9f50abf3b 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -61,9 +61,9 @@ case x"$GRUBFS" in
            GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
        fi;;
     xzfs)
+       rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
        bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
-       LINUX_ROOT_DEVICE="ZFS=${RPOOL}${bootfs}"
-       GRUB_CMDLINE_LINUX="boot=zfs rpool=${RPOOL} bootfs=${RPOOL}${bootfs} ${cmdline} ${GRUB_CMDLINE_LINUX}";;
+       LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
 esac
 
 title_correction_code=