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

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

Browse source 
* util/getroot.c (grub_util_get_grub_dev): Fix OS selection #ifdefs.
This commit is contained in:
Robert Millan 2011-10-15 18:37:55 +02:00
parent 0017e5ef84
commit 8bcebcb8e4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2011-10-15 Robert Millan <rmh@gnu.org>
Fix build problem on FreeBSD and GNU/kFreeBSD. Fix build problem on FreeBSD and GNU/kFreeBSD.

6
util/getroot.c
View file

@ -1137,7 +1137,9 @@ grub_util_get_grub_dev (const char *os_dev)
} }
break; break;
#endif
#ifdef __linux__
case GRUB_DEV_ABSTRACTION_LUKS: case GRUB_DEV_ABSTRACTION_LUKS:
{ {
char *uuid, *dash; char *uuid, *dash;
@ -1152,9 +1154,10 @@ grub_util_get_grub_dev (const char *os_dev)
grub_free (uuid); grub_free (uuid);
} }
break; break;
#endif
case GRUB_DEV_ABSTRACTION_GELI:
#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
case GRUB_DEV_ABSTRACTION_GELI:
{ {
char *whole; char *whole;
struct gmesh mesh; struct gmesh mesh;
@ -1201,7 +1204,6 @@ grub_util_get_grub_dev (const char *os_dev)
} }
} }
} }
#endif
break; break;
#endif #endif