git: ac4847e6b0e9 - main - rescue: belatedly add zfsbootcfg
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 12 Feb 2024 18:53:35 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=ac4847e6b0e9a4ab71c96826afadb06ae78e702a
commit ac4847e6b0e9a4ab71c96826afadb06ae78e702a
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-12 18:44:32 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-12 18:44:32 +0000
rescue: belatedly add zfsbootcfg
nextboot.sh uses zfsbootcfg to enable nextboot functionality for ZFS,
but zfsbootcfg was never added. Add it now since the nextboot binary
that replaced the script also uses it via system.
Sponsored by: Netflix
Reviewed by: kevans, kib, emaste
Differential Revision: https://reviews.freebsd.org/D43844
---
rescue/rescue/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 0a8d142ef83a..de3dd8a64575 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -133,6 +133,7 @@ CRUNCH_PROGS_sbin+= routed rtquery
.if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= bectl
CRUNCH_PROGS_sbin+= zfs
+CRUNCH_PROGS_sbin+= zfsbootcfg
CRUNCH_PROGS_sbin+= zpool
CRUNCH_PROGS_usr.sbin+= zdb
.endif
@@ -154,6 +155,7 @@ CRUNCH_LIBS_zfs+= ${LIBBE} \
CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs}
CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs}
CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} ${LIBZDB}
+CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV}
.else
# liblzma needs pthread
CRUNCH_LIBS+= -lpthread