svn commit: r336354 - head/stand/i386/zfsboot

Li-Wen Hsu lwhsu at FreeBSD.org
Mon Jul 16 19:21:51 UTC 2018


Author: lwhsu (ports committer)
Date: Mon Jul 16 19:21:50 2018
New Revision: 336354
URL: https://svnweb.freebsd.org/changeset/base/336354

Log:
  zfsboot: fix build with WITHOUT_LOADER_GELI
  
  Reviewed by:	ian
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D16292

Modified:
  head/stand/i386/zfsboot/zfsboot.c

Modified: head/stand/i386/zfsboot/zfsboot.c
==============================================================================
--- head/stand/i386/zfsboot/zfsboot.c	Mon Jul 16 19:05:50 2018	(r336353)
+++ head/stand/i386/zfsboot/zfsboot.c	Mon Jul 16 19:21:50 2018	(r336354)
@@ -708,7 +708,9 @@ main(void)
     setheap(heap_next, heap_end);
 
     zdsk = malloc(sizeof(struct zfsdsk));
+#ifdef LOADER_GELI_SUPPORT
     zdsk->gdev = NULL;
+#endif
     zdsk->dsk.drive = *(uint8_t *)PTOV(ARGS);
     zdsk->dsk.type = zdsk->dsk.drive & DRV_HARD ? TYPE_AD : TYPE_FD;
     zdsk->dsk.unit = zdsk->dsk.drive & DRV_MASK;


More information about the svn-src-head mailing list