From: Robert Millan <rmh@gnu.org>
Date: Sat, 15 Oct 2011 16:37:55 +0000 (+0200)
Subject: 2011-10-15  Robert Millan  <rmh@gnu.org>
X-Git-Tag: 2.00~1100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bcebcb8e4cb75b0b6deffeb735c9fe26eb437b1;p=thirdparty%2Fgrub.git

2011-10-15  Robert Millan  <rmh@gnu.org>

        * util/getroot.c (grub_util_get_grub_dev): Fix OS selection #ifdefs.
---

diff --git a/ChangeLog b/ChangeLog
index 723531f5c..11b14ec28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-15  Robert Millan  <rmh@gnu.org>
+
+	* util/getroot.c (grub_util_get_grub_dev): Fix OS selection #ifdefs.
+
 2011-10-15  Robert Millan  <rmh@gnu.org>
 
 	Fix build problem on FreeBSD and GNU/kFreeBSD.
diff --git a/util/getroot.c b/util/getroot.c
index 510049acb..3d6f9370c 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -1137,7 +1137,9 @@ grub_util_get_grub_dev (const char *os_dev)
       }
 
       break;
+#endif
 
+#ifdef __linux__
     case GRUB_DEV_ABSTRACTION_LUKS:
       {
 	char *uuid, *dash;
@@ -1152,9 +1154,10 @@ grub_util_get_grub_dev (const char *os_dev)
 	grub_free (uuid);
       }
       break;
+#endif
 
-    case GRUB_DEV_ABSTRACTION_GELI:
 #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
+    case GRUB_DEV_ABSTRACTION_GELI:
       {
 	char *whole;
 	struct gmesh mesh;
@@ -1201,7 +1204,6 @@ grub_util_get_grub_dev (const char *os_dev)
 	      }
 	  }
       }
-#endif
       break;
 #endif