Fix compilation on GNU/Linux.

	* grub-core/kern/emu/getroot.c (grub_util_pull_device) [!FreeBSD]:
	Disable geli.
	(grub_util_get_grub_dev) [!FreeBSD]: Likewise.
	(grub_util_pull_device) [HAVE_DEVICE_MAPPER]: Fix const and func name.
	* grub-core/disk/cryptodisk.c (grub_cryptodisk_open): Fix proto.

diff --git a/ChangeLog b/ChangeLog
index b587dae2a846230e67b446f05e0705ffa375c204..4bef20b13507b539b2badfd6ab6e40e00806a8e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix compilation on GNU/Linux.
+
+       * grub-core/kern/emu/getroot.c (grub_util_pull_device) [!FreeBSD]:
+       Disable geli.
+       (grub_util_get_grub_dev) [!FreeBSD]: Likewise.
+       (grub_util_pull_device) [HAVE_DEVICE_MAPPER]: Fix const and func name.
+       * grub-core/disk/cryptodisk.c (grub_cryptodisk_open): Fix proto.
+
 2011-07-07  Vladimir Serbinenko  <phcoder@gmail.com>
 2011-07-07  Michael Gorven  <michael@gorven.za.net>
 2011-07-07  Clemens Fruhwirth <clemens@endorphin.org>

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 1a5e8164bcbc7ff62e502eafc7082cd25e4c00aa..2852b65c42fe6ffb2aca1c0f276f7e70700dd78d 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -413,8 +413,7 @@ grub_cryptodisk_iterate (int (*hook) (const char *name),
 }
 
 static grub_err_t
-grub_cryptodisk_open (const char *name, grub_disk_t disk,
-               grub_disk_pull_t pull __attribute__ ((unused)))
+grub_cryptodisk_open (const char *name, grub_disk_t disk)
 {
   grub_cryptodisk_t dev;
 

diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index 380c5a7d19deaacdaf2dd196f835f1a6e2a5c140..9986fc5fc41f1d220cf17a002092434c39ed62e6 100644 (file)
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -975,6 +975,7 @@ grub_util_pull_device (const char *os_dev)
   switch (ab)
     {
     case GRUB_DEV_ABSTRACTION_GELI:
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
       {
        char *whole;
        struct gmesh mesh;
@@ -1035,8 +1036,8 @@ grub_util_pull_device (const char *os_dev)
 
            grub_free (grdev);
          }
-
       }
+#endif
       break;
 
     case GRUB_DEV_ABSTRACTION_LVM:
@@ -1065,14 +1066,14 @@ grub_util_pull_device (const char *os_dev)
                grub_util_pull_device (subdev);
              }
          }
-       if (ab == GRUB_DEV_ABSTRACTION_CRYPTO && lastsubdev)
+       if (ab == GRUB_DEV_ABSTRACTION_LUKS && lastsubdev)
          {
            char *grdev = grub_util_get_grub_dev (lastsubdev);
            dm_tree_free (tree);
            if (grdev)
              {
                grub_err_t err;
-               err = grub_luks_cheat_mount (grdev, os_dev);
+               err = grub_cryptodisk_cheat_mount (grdev, os_dev);
                if (err)
                  grub_util_error ("Can't mount crypto: %s", grub_errmsg);
              }
@@ -1141,6 +1142,7 @@ grub_util_get_grub_dev (const char *os_dev)
       break;
 
     case GRUB_DEV_ABSTRACTION_GELI:
+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
       {
        char *whole;
        struct gmesh mesh;
@@ -1187,6 +1189,7 @@ grub_util_get_grub_dev (const char *os_dev)
              }
          }
       }
+#endif
       break;
 
     case GRUB_DEV_ABSTRACTION_RAID: