Date: Mon, 16 Jul 2018 19:21:51 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336354 - head/stand/i386/zfsboot Message-ID: <201807161921.w6GJLpnX083208@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807161921.w6GJLpnX083208>