From: Vladimir Serbinenko Date: Thu, 14 Nov 2013 21:38:36 +0000 (+0100) Subject: * grub-core/osdep/bsd/hostdisk.c (grub_util_get_fd_size_os): Fix X-Git-Tag: grub-2.02-beta1~324 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=da5ed5cf6b0e81c3ed215c56bdb2fa2c7a09d466;p=thirdparty%2Fgrub.git * grub-core/osdep/bsd/hostdisk.c (grub_util_get_fd_size_os): Fix compilation on NetBSD. --- diff --git a/ChangeLog b/ChangeLog index a94fd8820..cfa917553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-14 Vladimir Serbinenko + + * grub-core/osdep/bsd/hostdisk.c (grub_util_get_fd_size_os): Fix + compilation on NetBSD. + 2013-11-14 Vladimir Serbinenko * acinclude.m4: Don't add -P on initial nm test. diff --git a/grub-core/osdep/bsd/hostdisk.c b/grub-core/osdep/bsd/hostdisk.c index 0e32b9822..c82d60e11 100644 --- a/grub-core/osdep/bsd/hostdisk.c +++ b/grub-core/osdep/bsd/hostdisk.c @@ -104,8 +104,10 @@ grub_util_get_fd_size_os (grub_util_fd_t fd, const char *name, unsigned *log_sec struct disklabel label; unsigned sector_size, log_sector_size; +#if defined(__NetBSD__) grub_hostdisk_configure_device_driver (fd); - +#endif + if (ioctl (fd, DIOCGDINFO, &label) == -1) return -1;