2011-10-15 Robert Millan <rmh@gnu.org>
* util/getroot.c (grub_util_get_grub_dev): Fix OS selection #ifdefs.
This commit is contained in:
parent
0017e5ef84
commit
8bcebcb8e4
2 changed files with 8 additions and 2 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue