From nobody Sat Dec 13 22:55:54 2025 X-Original-To: dev-commits-src-all@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 4dTMB23nD4z6KDwG for ; Sat, 13 Dec 2025 22:55:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dTMB22zRxz3FpZ for ; Sat, 13 Dec 2025 22:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765666554; 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=PcnBCulaRibrpUXwFc2TwCz0SnINqs6+dshP+xMQwVc=; b=Tz6f4FxfbuOEgaIq5jVlbxW/SRLjwnwd64GZGFD33R0f7I0RRgQBKUfkSQ4eItcIxH//1S aCwqbptLVQQHs3OQhObq0TE3m5hmJq+zk63diY/13zL/DLmB+iqMPk95/hfYvU0Gr4kdcl y1j1aQzaNT77KM45kQs77Uih7aMWYuv0vKhS44hjJ2YELEhNL1HX9CFiFY0pw7n9gglCDy ylRjQhOF0sP22DLhb/JoqjLMXwvTT0cZNUXcHuXtTFL/ZlLtjBYaYwINRpsw0d4abAHJmL +5BUzoGWBC3Wd6KNbnCoCl1G337GcpDB3RM/4BXiM/1iNI8/e85hspwwb7NH1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765666554; 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=PcnBCulaRibrpUXwFc2TwCz0SnINqs6+dshP+xMQwVc=; b=NVp/g5cRwJfbHk/0CY82gtIEfFi/vZaKtx7vm+Af9a+PRNJZIznqukOkmHql121lR7iOHX 4jiADBvx+8Oz5ZHFweYN+Jz+tBvLyqsLP4qD/LYYRYNmquGcwUjQyq4RmjuPIa/5Dm1SZ0 PstDOSWx4+3+EmMSLJOoi09BopIFmGgIurU6fu5xQySdpkgYN2IrbVJLDXNS9kC/iWr+oP MupOHN4L2Ynkf9xLuqd3ESukJ9uWGCplJl5VEBxrRP6uk6SkS0uvzlJywFYywbDK3ZkBnY nG7dEoj508cuKu71/0iR1LXA70hQHDPesMV4DhuxSALlH8m1+KaKkrygbCA6dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765666554; a=rsa-sha256; cv=none; b=HVByosrv5yt/qIPZxHOSZnRfO0BG+BA0N2P0BbndnRZPGMMJnz/VRacA9H7tcx7Nj6UJkR MGAVycHUOy31+94uVozl8np1HhmCfj4khCvKIK9C+cyeLD+iRpbfqViBFLHIhyeH7rnn0d NsEQ/8bSPxceuPZ/FPyGsMk+E+5AofPClIUtgSA+YlSAE+6Pfij3k7yhQJwRFo/dIwobM6 Ilho8D1jkgQbW+dMOy/yEcaXhgSyuf6eWmubClmWMJfVGn4TTPCQRU0KRg0nSPDHbj0Bio nF2uNgWNuuxvBagZo9zqFfnYv5mQ8EK/ChwK8ilMsaNOaCblA2icdjDlhxB7nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dTMB22J4Qz1LSM for ; Sat, 13 Dec 2025 22:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Dec 2025 22:55:54 +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: 33510b16e663 - stable/14 - nextboot: Reimplement missing -a option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 33510b16e663bde5be5e4a56ccb17f848c41ef4e Auto-Submitted: auto-generated Date: Sat, 13 Dec 2025 22:55:54 +0000 Message-Id: <693deefa.3cc03.148779ba@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=33510b16e663bde5be5e4a56ccb17f848c41ef4e commit 33510b16e663bde5be5e4a56ccb17f848c41ef4e Author: Dag-Erling Smørgrav AuthorDate: 2025-12-13 22:46:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-13 22:54:14 +0000 nextboot: Reimplement missing -a option PR: 260520 MFC after: 3 days Fixes: e307eb94ae52 ("loader: zfs should support bootonce an nextboot") --- sbin/reboot/nextboot.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh index 0c9cca51eb8d..5b8611b499ab 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