* util/grub.d/10_linux.in: Use stat if grub-probe on root fails.

	* util/grub.d/20_linux_xen.in: Likewise.
	Based on Debian patch.

diff --git a/ChangeLog b/ChangeLog
index fc1645562464c8a99a20af023a3d5585947cea21..1c26fbb24d8881493017ed729c9fa4ea5f71c8cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/10_linux.in: Use stat if grub-probe on root fails.
+       * util/grub.d/20_linux_xen.in: Likewise.
+       Based on Debian patch.
+
 2012-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub.d/10_linux.in: Fix syntax error resulting in

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 5fc5218550ebd05f8bd2ce5d62b5c7698f8776c4..8c75fab296e09a19d4964e9b92622a7f0dd404ab 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -53,6 +53,10 @@ fi
 
 GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
 
+if [ x"$GRUBFS" = x ]; then
+    GRUBFS="$(stat -f --printf=%T / || true)"
+fi
+
 case x"$GRUBFS" in
     xbtrfs)
        rootsubvol="`make_system_path_relative_to_its_root /`"

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index b839d0d03a523044796c4c2e01d15f230b44a355..8bdc4dcebf6ebde26bed07acde856feee0180d76 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -61,6 +61,10 @@ fi
 
 GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
 
+if [ x"$GRUBFS" = x ]; then
+    GRUBFS="$(stat -f --printf=%T /)"
+fi
+
 case x"$GRUBFS" in
     xbtrfs)
        rootsubvol="`make_system_path_relative_to_its_root /`"