From nobody Mon Feb 12 18:53:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TYYWg5h0nz5BMYy; Mon, 12 Feb 2024 18:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYYWg26zpz4mBH; Mon, 12 Feb 2024 18:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5FFaT8uSjvSzH2i+YIkKqcMk0/T+uY4yv0IAI/zKH0=; b=RcHRhrNwxz3EvyA+mPprRJ9MRms5f93wds5HwN3ug90LRGqGdL6wmYY5C16aguDBuChZnu 9hDMZ7uTT7/mBINQaCPELDSEVErxkO1jqBOUg3ERw+hVaqFtdUmqKzUNfTEHDRDbZUwGyp XyvehKpLZgMMojti34fQUM+G7Kt1tdL1I82rabBSgz6STBS9fV+6Zw+UjnNsjj5UXRCEWj 8sREBDbmmozYKcixr5pOEWRwlHBJEwO3NYZtG6jUEIHwlsSOyoENVnJIoqTYpnA6pqvviO ghwQCXxvPVmFZPhH4PX5ejuBCo3q3MF4Fwht6wcvjtK6jjNJijv44XtFLgW3ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764015; a=rsa-sha256; cv=none; b=JgK6iJoUGMkp9S6Z+MDrYHgGHH5H1b8WcJUiOMNt+RBaMkw2o0qqL8HwaOq1fobsbzaJ2v f3X5fe/EzDm1xQ+hzmf0Wu2W8NTRJONuc+PocRbBlIC0MH6FOZbNlVMg54KUb9EXKHS5dt OJ1bnNrFBhTRKDkbwdaX4yiT2HroSdtmk9aCbL8OstzRYnhDXBLG1V5nhNPmKXG8qqJF9+ cPNeILoqSGs3DMo+59JiMYmsIdLwRh2i4JeKuN/mWDJUKklMDg3uDdmyVIKV8uRuCnxuA4 s515MffBirqRdAgXzaKhV4Ug0bjqG9w5xdTunF7nbKaJtSl7YMFXWcS544+Wpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5FFaT8uSjvSzH2i+YIkKqcMk0/T+uY4yv0IAI/zKH0=; b=SS045/UPPryXcXuujpd80bBF4bITej69ix7c5Jh+lLAZ/l9LTBQOFxDaztJo1ytRPsAtSX sODCbodxqs01Rgj2pe5kgIRfcrQ9a9hI5GL1nkZlE80QhFv+k16IgGZO1OnXz0uC7oYGAl 1GU2zBjNHhp/thljFzwU6C4WH/zChgWrhK1VbyviLeoiCKYTPfpf9OY467Tcrxi5XOMVlA tHvD6w0XsEUhqmUwOpPUeYpkRBz/1ww2Ee05x+ZBqtyKvzs6p2qA/P6tXi3oB88KOeAz1h t+EvHGAyI4SP+DgpjbRZvoNKS4tuI16dNx3wZ1wCZCF+wm3ZESlh+OazYEcLpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWg1BBLzjQX; Mon, 12 Feb 2024 18:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CIrZsU030308; Mon, 12 Feb 2024 18:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrZcr030305; Mon, 12 Feb 2024 18:53:35 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:35 GMT Message-Id: <202402121853.41CIrZcr030305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ac4847e6b0e9 - main - rescue: belatedly add zfsbootcfg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac4847e6b0e9a4ab71c96826afadb06ae78e702a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4847e6b0e9a4ab71c96826afadb06ae78e702a commit ac4847e6b0e9a4ab71c96826afadb06ae78e702a Author: Warner Losh AuthorDate: 2024-02-12 18:44:32 +0000 Commit: Warner Losh 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