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

* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if

Browse source 
[HAVE_LIBZFS && HAVE_LIBNVPAIR]
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-01 16:11:27 +02:00
parent ea9be8eadb
commit 8687cf071e
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2010-08-01 Vladimir Serbinenko <phcoder@gmail.com>
* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if
[HAVE_LIBZFS && HAVE_LIBNVPAIR]
2010-08-01 Colin Watson <cjwatson@ubuntu.com> 2010-08-01 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img. * util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img.
@ -41,7 +46,7 @@
2010-08-01 Robert Millan <rmh@gnu.org> 2010-08-01 Robert Millan <rmh@gnu.org>
* kern/emu/getroot.c: Include `<grub/util/misc.h>'. * kern/emu/getroot.c: Include `<grub/util/misc.h>'.
2010-07-31 Robert Millan <rmh@gnu.org> 2010-07-31 Robert Millan <rmh@gnu.org>
* util/grub.d/10_kfreebsd.in: Make module handling more generic. * util/grub.d/10_kfreebsd.in: Make module handling more generic.

4
kern/emu/getroot.c
View file

@ -98,6 +98,8 @@ xgetcwd (void)
return path; return path;
} }
#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
static char * static char *
find_mount_point_from_dir (const char *dir) find_mount_point_from_dir (const char *dir)
{ {
@ -154,6 +156,8 @@ find_mount_point_from_dir (const char *dir)
} }
} }
#endif
#ifdef __linux__ #ifdef __linux__
/* Statting something on a btrfs filesystem always returns a virtual device /* Statting something on a btrfs filesystem always returns a virtual device