From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Jun 2011 02:32:54 +0000 (+0200)
Subject: 	* grub-core/kern/emu/getroot.c (grub_guess_root_device): Revert to
X-Git-Tag: 2.00~1201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc09e1a23804bd4132a51bca01851135d7307bff;p=thirdparty%2Fgrub.git

	* grub-core/kern/emu/getroot.c (grub_guess_root_device): Revert to
	old method if mountinfo would return /dev/root and /dev/root doesn't
	exist.
---

diff --git a/ChangeLog b/ChangeLog
index 954166148..1b63af871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/getroot.c (grub_guess_root_device): Revert to
+	old method if mountinfo would return /dev/root and /dev/root doesn't
+	exist.
+
 2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	ZFS zlib support
diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index db27abf74..6d6c8ef8b 100644
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -620,11 +620,13 @@ grub_guess_root_device (const char *dir)
       int root = (strcmp (os_dev, "/dev/root") == 0);
       if (!dm && !root)
 	return os_dev;
-      if (stat (os_dev, &st) < 0)
-	grub_util_error ("cannot stat `%s'", os_dev);
+      if (stat (os_dev, &st) >= 0)
+	{
+	  free (os_dev);
+	  dev = st.st_rdev;
+	  return grub_find_device (dm ? "/dev/mapper" : "/dev", dev);
+	}
       free (os_dev);
-      dev = st.st_rdev;
-      return grub_find_device (dm ? "/dev/mapper" : "/dev", dev);
     }
 
   if (stat (dir, &st) < 0)