diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-02-08 12:39:04 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-02-08 15:51:08 +0000 |
| commit | a4e5e0106ac7145f56eb39a691e302cabb4635be (patch) | |
| tree | 8dac13394184eb6bc756212b00c57c85c1e7f276 /rescue | |
| parent | 4594eb454891e6247a6ea786f467a0b960ddd835 (diff) | |
| parent | 229b9f4ed05e6d14fb4d73fa04a71e99b01bb534 (diff) | |
| download | src-a4e5e0106ac7145f56eb39a691e302cabb4635be.tar.gz src-a4e5e0106ac7145f56eb39a691e302cabb4635be.zip | |
zfs: merge openzfs/zfs@229b9f4ed
Notable upstream pull request merges:
#15769 082338875 Add 'zpool status -e' flag to see unhealthy vdevs
#15804 a0d3fe72b libzdb: Initial breakout of libzdb
#15847 229b9f4ed LUA: Backport CVE-2020-24370's patch
Obtained from: OpenZFS
OpenZFS commit: 229b9f4ed05e6d14fb4d73fa04a71e99b01bb534
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 7bf3299f4d48..0a8d142ef83a 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -153,7 +153,7 @@ CRUNCH_LIBS_zfs+= ${LIBBE} \ ${LIBNVPAIR} CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs} -CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} +CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} ${LIBZDB} .else # liblzma needs pthread CRUNCH_LIBS+= -lpthread |