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 723531f5c6f68e49602e6477b4e9475b779d7035..11b14ec2825227b6cbd9a886d4ff86f1deeba842 100644 (file)
--- 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 510049acbac0dd290a1684c7ec6012e0bea0a55d..3d6f9370c3948c85674736de8d55a32d6e2058a5 100644 (file)
--- 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