--- 00_header.dist-pkg	2015-01-07 11:33:50.775109226 -0800
+++ 00_header	2015-01-07 11:37:21.735108700 -0800
@@ -106,18 +106,37 @@
 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 raid ; do
+            case "$ABSTRACTION" in
+              "$check_abstraction" | \
+              *"$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