diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2018-12-06 20:28:09 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2018-12-06 20:28:09 +0000 |
| commit | 9631ae826787274753b7f8eb33adef9665078c16 (patch) | |
| tree | a8a6ff045fdebccf3b9e76172c330c83488790ea /stand/i386/loader | |
| parent | efc4145a6ed0e659dd9b48528aa56c07f4405a31 (diff) | |
| download | src-test2-9631ae826787274753b7f8eb33adef9665078c16.tar.gz src-test2-9631ae826787274753b7f8eb33adef9665078c16.zip | |
Notes
Diffstat (limited to 'stand/i386/loader')
| -rw-r--r-- | stand/i386/loader/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 0ce3ff5fc9d8..a7d1e82fd488 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -195,11 +195,14 @@ main(void) */ #define LEGACY_GELI_ARGS_SIZE 260 /* This can never change */ +#ifdef LOADER_ZFS_SUPPORT if (zargs != NULL) { if (zargs->size > offsetof(struct zfs_boot_args, gelidata)) { gbdata = &zargs->gelidata; } - } else if ((kargs->bootflags & KARGS_FLAGS_EXTARG) != 0) { + } else +#endif /* LOADER_ZFS_SUPPORT */ + if ((kargs->bootflags & KARGS_FLAGS_EXTARG) != 0) { gargs = (struct geli_boot_args *)(kargs + 1); if ((kargs->bootflags & KARGS_FLAGS_GELI) || gargs->size == LEGACY_GELI_ARGS_SIZE) { |