--- etc/grub.d/orig/10_linux	2020-11-12 18:15:13.000000000 -0500
+++ etc/grub.d/10_linux	2020-12-03 13:44:53.850486875 -0500
@@ -135,6 +135,9 @@
 	  exit 0
 	fi
 	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
+        if [ "${rpool}" = "" ]; then
+	   rpool=`/usr/sbin/zfs list | awk '{if( $5 == "/" ) { print $1; }}' | sed "s:/.*::" | head -1`
+        fi
 	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
 	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
 	;;
--- etc/grub.d/orig/20_linux_xen	2020-07-30 20:34:25.000000000 -0400
+++ etc/grub.d/20_linux_xen	2020-12-03 13:59:04.498557236 -0500
@@ -86,6 +86,9 @@
 	fi;;
     xzfs)
 	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
+        if [ "${rpool}" = "" ]; then
+	   rpool=`/usr/sbin/zfs list | awk '{if( $5 == "/" ) { print $1; }}' | sed "s:/.*::" | head -1`
+        fi
 	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
 	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
 	;;