mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-29 18:49:22 +00:00
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:
1 parent
0017e5ef84
commit
8bcebcb8e4
2 files changed
+8
-2
No files matched your search
@@ -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.
|
||||||
|
|||||||
+4
-2
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user