From nobody Thu Feb 5 15:01:34 2026 X-Original-To: dev-commits-src-branches@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 4f6L5p73CMz6QjR0 for ; Thu, 05 Feb 2026 15:01:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6L5p1mNHz3Rhw for ; Thu, 05 Feb 2026 15:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770303694; 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=ddCW6u3TxxeugZz2+yZOf6UZv/+o987cbwiyElf/9zw=; b=i/+wgW+v6lVi4hPhV0ydCWcGMv/zlA2RJr5ZO8CkRdlNwIsNc5RPmGt0AYmEigBeW/JeCw cPaOYHu9uTVzthwDSX2zUDiVxfez+4kXsFFrn7Tsw7eUFdPI/2+TQI+pVqgC5aOAZDn7FH uyhRE95p8uINV+T5pM5EMYRy2dxZJqX6KbAotozQdIoyb8usebq9VIHfpUswoCClcWjkcN ZYJiy55FX/HN9p0KKgKm+Bi9fz+HsM9cg9LekzhKYb95tfvCnR5/UwO1LBIRs9tM9DBbAY VNy/pXqtLXZux+hA6vXJG+SUER4Bhi3wOzNa/Bc/IUm8YJ1L1o4pdYqUaKmiJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770303694; a=rsa-sha256; cv=none; b=Vc7Z0kPmvrkbow83ZfucaMCzNq87GNkk25In8LbX6DxCB287MJinB/LO3ldLN4Zo6IMnJ3 +yv2xKjrsqVxFlhwJ+QtFtJJABTfFkUzHckqmNucHJMW6/LhM9AERR/REWXneyMB4VZmiQ X7FTCWoEmUwHIRzUWIWxdBtgnbpLx+pyruYWkdMNIdoa4aaQ3s7N7xoip0ZZHYdk8AGLCH Yev/rIx3ZdHAs9EAfPSgWt6BEBcZhhFWgvIz2ESMGMgcB50JRU34db4snpA+PsysTSe2mD p6ZkjD6geKJFuS12/sEgVHpx/5rfAl5riD9/khUJ41IkidkvaSe07p/rz8nB6g== 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=1770303694; 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=ddCW6u3TxxeugZz2+yZOf6UZv/+o987cbwiyElf/9zw=; b=C5VWmtHZaeAqVfpnhjF41kqpeqSgpBCsV1PfA93LzBJdcCPaAwL2lAlCuVdIt38F2Qe0Z6 DRXXnGVrsDIn/6cX2fMbvUslWMydW5HB1lUId7v3hIF2fQTSOtfkxW1QR85OYgfv4CGatZ RUzAQS4S9nuo47FMKIOYhvFJ31HlF8zTPXqgePUyO1l8CST7lhk1q5o6QH4eG5EiYfF92w X5NMGrzTKBsJtQ7+BpT0EbaNcs/GdHJmxNiWzZ269QzArR8KhcoOV5G3C0iubIfOL4dRGZ TnoW0mGYDedxEpWZ0Uz4OGd8pi1bOWDtBmG/6NN6RAck/Uza19qNm278xdAVQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6L5p13dzzbL3 for ; Thu, 05 Feb 2026 15:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d035 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:01:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b3f23ae1e22b - stable/13 - nextboot: Reimplement missing -a option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b3f23ae1e22bf88de5ec09c524e7e0beb16b5c76 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:01:34 +0000 Message-Id: <6984b0ce.3d035.71705e7@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f23ae1e22bf88de5ec09c524e7e0beb16b5c76 commit b3f23ae1e22bf88de5ec09c524e7e0beb16b5c76 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-13 22:46:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 15:01:12 +0000 nextboot: Reimplement missing -a option PR: 260520 MFC after: 3 days Fixes: e307eb94ae52 ("loader: zfs should support bootonce an nextboot") (cherry picked from commit 33510b16e663bde5be5e4a56ccb17f848c41ef4e) --- sbin/reboot/nextboot.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh index 4b34001677ff..d68c865da4e5 100644 --- a/sbin/reboot/nextboot.sh +++ b/sbin/reboot/nextboot.sh @@ -115,6 +115,10 @@ set -e nextboot_tmp=$(mktemp $(dirname ${nextboot_file})/nextboot.XXXXXX) +if [ ${append} = "YES" -a -f ${nextboot_file} ]; then + cp -f ${nextboot_file} ${nextboot_tmp} +fi + if [ -n "${zfs}" ]; then zfsbootcfg -z ${zfs} -n freebsd:nvstore -k nextboot_enable -v YES cat >> ${nextboot_tmp} << EOF