diff -ru grub.d.old/00_header grub.d.new/00_header
--- grub.d.old/00_header	2014-05-15 19:02:12.000000000 +0000
+++ grub.d.new/00_header	2015-01-07 09:24:54.670834591 +0000
@@ -106,18 +106,36 @@
 function recordfail {
   set recordfail=1
 EOF
+    skip_recordfail=
     FS="$(grub-probe --target=fs "${grubdir}")"
     case "$FS" in
       btrfs | cpiofs | newc | odc | romfs | squash4 | tarfs | zfs)
+        skip_recordfail=$FS
+        ;;
+      *)
+        ABSTRACTION="$(grub-probe --target=abstraction "${grubdir}")"
+	for check_abstraction in lvm ; do
+            case "$ABSTRACTION" in
+              "$check_abstraction" | \
+              "$check_abstraction "* | \
+              *" $check_abstraction" | \
+              *" $check_abstraction "*)
+                skip_recordfail=$check_abstraction
+                break
+                ;;
+            esac
+        done
+        ;;
+    esac
+    if [ -n "$skip_recordfail" ]; then
 	cat <<EOF
-  # GRUB lacks write support for $FS, so recordfail support is disabled.
+  # GRUB lacks write support for $skip_recordfail, so recordfail support is disabled.
 EOF
-	;;
-      *)
+    else
 	cat <<EOF
   if [ -n "\${have_grubenv}" ]; then if [ -z "\${boot_once}" ]; then save_env recordfail; fi; fi
 EOF
-    esac
+    fi
     cat <<EOF
 }
 EOF