Fix userboot w/ ZFS after r329725
r329725 cleaned up ZFS commands duplicated in multiple places, but userboot was not setting HAVE_ZFS when MK_ZFS != "no". This resulted in a failure to boot (as seen in PR 226118) in bhyve, with the following message: /boot/userboot.so: Undefined symbol "ldi_get_size" PR: 226118 Glanced at by: imp
This commit is contained in:
parent
deeec7728b
commit
b0d9fbf070
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329831
@ -42,6 +42,7 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUARCH}
|
|||||||
.if ${MK_ZFS} != "no"
|
.if ${MK_ZFS} != "no"
|
||||||
CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
|
CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
|
||||||
LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a
|
LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a
|
||||||
|
HAVE_ZFS=yes
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Always add MI sources
|
# Always add MI sources
|
||||||
|
Loading…
Reference in New Issue
Block a user