From nobody Wed Nov 08 01:03:19 2023 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 4SQ6K41rt1z4yy1F; Wed, 8 Nov 2023 01:03:20 +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 4SQ6K40TJZz3Vvd; Wed, 8 Nov 2023 01:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405400; 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=8duLdvoa7iY0IUJ/mBpaWuKyxIKlwPuiB00Dmine+q8=; b=E+KelGazR3EJtHATm5/bjtA8NNfmQBxq94XXNTGGf69oIKPvVP+32p+3OZ0NDFapoET1bH 7rO81pegnz/nb7x7Oi9x/DqGeS8E3SYCBoBX5fwL8RTChISc2qJ5PgKyFN+BFcZgbJK5z1 CYaMXBbHyjNsQMgm0B3BMSJgW8g3RnJI4ckLNy3TdcUAvj7uSLBoSCttbJvVXINZQNFKoV FtDn+35E3GzwNPJzKQF5lbciO65Z+WzUrmquY4BpaBmvvqunPOW5rnKlwQd3x6tfyLd7eV FwECYIKzGtO5y8qhEOcJEBIO914eXnQ0tjKljCNja/b81/Qm39AS5KECvfl3YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405400; 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=8duLdvoa7iY0IUJ/mBpaWuKyxIKlwPuiB00Dmine+q8=; b=ahlZwZmWb02tyhL+adHnhTuW4UbdyPhXK+3dHEN4JZrzCSpSD+agUF2uZeRu6Q2/z8Y6r/ F5I2GfC4+pwBP8SCyN2p1nxaRGZAKi/yAxyVrfGUDAcsqrzzJao0lH5D0W/LWvZLLM5OkO v6+tA/556Tlj09DZsnzNpiAkHWzyc/XO0xdHi211EPbthsleE/gO7DL+JGFuuLf7XauLkr XOibeqeMeJWLc6U8L3ieyuPs40MAImUN6QRpCEMnGEzRMJgKUxjPZp1e1OX7epyXcb2bk1 35e70hww3wBaEFpYII213og8zfrcvPYUiWbCjf/3W4OI8koO1ZONeoM6CPpL3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405400; a=rsa-sha256; cv=none; b=TKxfprPfxKkDSeHY1BNIXs2Blf3kUhFdDrIrkWLaWk3HiPRNPDx+oV5fr5R2R+LQ5he8qY S4uDupcYLbHu9cxxpkrEv6ktfnYqOMG5RnIlkl6RVIL1kcukHinjQG1arUPggWS3fj+4j6 PismU9Wp6Pf3tXwOMO8xUGMJQv19U6IXqStouJqisIlmye7oK1RxMS1fmY0dLPg5UYuOoC M6MNcjcmXxWnRqRowPDL9eqC7WKo45OclRRUGDnNg4O9QQ031eYf85cbhuxiedJ5XP+8SU PTbYpsiR1WlNetaTb2FulOEDcTXo5nsKoC2J9lMDENWvc5uHL7pZgK1mBG9+Hw== 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 4SQ6K36gfMz1Bs8; Wed, 8 Nov 2023 01:03:19 +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 3A813Jth004953; Wed, 8 Nov 2023 01:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A813J0j004950; Wed, 8 Nov 2023 01:03:19 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:03:19 GMT Message-Id: <202311080103.3A813J0j004950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e648a628a66a - releng/12.4 - freebsd-update: create deep BEs by default 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: e648a628a66a09973154b442ac1266316be20506 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e648a628a66a09973154b442ac1266316be20506 commit e648a628a66a09973154b442ac1266316be20506 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:01:37 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) (cherry picked from commit 5c2a559876d123ba386612319bf42e7b32dee590) Approved by: so Security: FreeBSD-EN-23:13 --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 324e838fd8a7..b9eb1066c58e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -918,7 +918,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else