vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compilation on GNU/Linux.

Browse source 
* 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.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-08 03:59:05 +02:00
parent a251b71915
commit cd8fe79a59
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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 Vladimir Serbinenko <phcoder@gmail.com>
2011-07-07 Michael Gorven <michael@gorven.za.net> 2011-07-07 Michael Gorven <michael@gorven.za.net>
2011-07-07 Clemens Fruhwirth <clemens@endorphin.org> 2011-07-07 Clemens Fruhwirth <clemens@endorphin.org>

3
grub-core/disk/cryptodisk.c
View file

@ -413,8 +413,7 @@ grub_cryptodisk_iterate (int (*hook) (const char *name),
} }
static grub_err_t static grub_err_t
grub_cryptodisk_open (const char *name, grub_disk_t disk, grub_cryptodisk_open (const char *name, grub_disk_t disk)
grub_disk_pull_t pull __attribute__ ((unused)))
{ {
grub_cryptodisk_t dev; grub_cryptodisk_t dev;

9
grub-core/kern/emu/getroot.c
View file

@ -975,6 +975,7 @@ grub_util_pull_device (const char *os_dev)
switch (ab) switch (ab)
{ {
case GRUB_DEV_ABSTRACTION_GELI: case GRUB_DEV_ABSTRACTION_GELI:
#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
{ {
char *whole; char *whole;
struct gmesh mesh; struct gmesh mesh;
@ -1035,8 +1036,8 @@ grub_util_pull_device (const char *os_dev)
grub_free (grdev); grub_free (grdev);
} }
} }
#endif
break; break;
case GRUB_DEV_ABSTRACTION_LVM: case GRUB_DEV_ABSTRACTION_LVM:
@ -1065,14 +1066,14 @@ grub_util_pull_device (const char *os_dev)
grub_util_pull_device (subdev); 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); char *grdev = grub_util_get_grub_dev (lastsubdev);
dm_tree_free (tree); dm_tree_free (tree);
if (grdev) if (grdev)
{ {
grub_err_t err; grub_err_t err;
err = grub_luks_cheat_mount (grdev, os_dev); err = grub_cryptodisk_cheat_mount (grdev, os_dev);
if (err) if (err)
grub_util_error ("Can't mount crypto: %s", grub_errmsg); grub_util_error ("Can't mount crypto: %s", grub_errmsg);
} }
@ -1141,6 +1142,7 @@ grub_util_get_grub_dev (const char *os_dev)
break; break;
case GRUB_DEV_ABSTRACTION_GELI: case GRUB_DEV_ABSTRACTION_GELI:
#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
{ {
char *whole; char *whole;
struct gmesh mesh; struct gmesh mesh;
@ -1187,6 +1189,7 @@ grub_util_get_grub_dev (const char *os_dev)
} }
} }
} }
#endif
break; break;
case GRUB_DEV_ABSTRACTION_RAID: case GRUB_DEV_ABSTRACTION_RAID: