* util/grub.d/10_linux.in: Fix syntax error resulting in

	Richard Laager's patch.
	* util/grub.d/20_linux_xen.in: Propagate Richard Laager's patch.

diff --git a/ChangeLog b/ChangeLog
index daa44adc6395374d59f095c3b966be9528d16da0..fc1645562464c8a99a20af023a3d5585947cea21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/10_linux.in: Fix syntax error resulting in
+       Richard Laager's patch.
+       * util/grub.d/20_linux_xen.in: Propagate Richard Laager's patch.
+
 2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/partmap_test.in: Replace qemu-img usage with dd to decrease

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index da210539d391d5a2f95028df296844a9f50abf3b..5fc5218550ebd05f8bd2ce5d62b5c7698f8776c4 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -64,6 +64,7 @@ case x"$GRUBFS" in
        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}"
+       ;;
 esac
 
 title_correction_code=

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 716565c434bf134865fa78242144956005ede1f9..b839d0d03a523044796c4c2e01d15f230b44a355 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -69,9 +69,10 @@ 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=