From nobody Tue Oct 24 00:05:01 2023 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 4SDskj5jCMz4yfJ9; Tue, 24 Oct 2023 00:05:01 +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 4SDskj5FBgz4GjX; Tue, 24 Oct 2023 00:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105901; 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=EN77u2WeFEkwoCIe+zyp8LQDTZBjfNWj8D9gshZVrqg=; b=Vt4ktZo5w2G1b3ABU/fMmWmIaJIm+Fu5SllYKYt0AItpyWcqT0sqwAWQmY5lDV9vi95ghU w/whEZonzE+sjeB9yR8CmxVCv5sjmnS7shqHmFNS1JhoDNJJk9/dz8PkewKPIIHQU/ZUjt FlqTQeIEAwEZlGkqwz3XxAJC8nFv85DFPfvyfh0hLB69nvwNEe7qji1lwlopm+7o45AqW+ Uim2N1+RqFXz1gVbM3pVX3RXRZGxmtokDnM8tStg9lEbqXMQdUxjb0VEHUCBY3H8Z3VCNU AgD9hGqy6DcAKVXoCxsKFCKDiYZDgUywQD4G23ghxK8yvrGdidh2bUskyTUpLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105901; a=rsa-sha256; cv=none; b=kVQ8N+1B/vxLEFxmh85H3lmZh33VN7Xpmor5r4iqA0stRQnBryIB8SJBGi5KrSA4a2BLpf J7X7RZDVvc3TsEclUHLGP8h2cl8T9SFNDL9LQgWKMKZhpcGjbizBTgkkS9eJ0a0xKSEX5Y zGlgslwL+/a4kUBtLQJQ3eizZZBk9naA0cFEjnK02aGsjeH8xndXcSlYyy9+Fwyxq9J91X HVzLqr/v0vVtC18K3H4FfW4KDJsuhSv3ibmVVM3xHlQ4Ie7pMMrIuT7rw/Xurdki2EYQF4 57ZeAlR5yRAZuUiAOwq06lD5qAbDEBu8vruP23nGrPvUiRYwmaEcj7ImKLV7/g== 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=1698105901; 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=EN77u2WeFEkwoCIe+zyp8LQDTZBjfNWj8D9gshZVrqg=; b=trcTnrYC/CIAdGFwxlsRVvKqruUtL633dm3k5Q1Dj1sWKxobu+Enlrv9KhVw0/+0DaEoF3 5EXrYVzlxXGTHtZn3NifZDd7ZEL3D+VDcwf5pQFxj0ilBogofY83fDi+2Lg/grQCBaDkqs SwMYFyGVtGyLsUcNSzRCBKHhjHMS0bGZrTpdFUn0QUGpSEyBBNnzU+YwsXZlo6xAHi0Y0c 8ci6CywkwN6go64bNApVJ3PDJcP4pNY8G9SvIqF3b8e0aZ+pXOxDzK+xnsuJQfZR6NLX3f O7s5WA/7WDrhiY226foAM5YXMdUs0E3lx5gHCUugSUfpYmRMxC/s5mmCGkv7fw== 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 4SDskj4HDGz11L7; Tue, 24 Oct 2023 00:05:01 +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 39O051Ol037945; Tue, 24 Oct 2023 00:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O051QC037942; Tue, 24 Oct 2023 00:05:01 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:05:01 GMT Message-Id: <202310240005.39O051QC037942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 80f747781f12 - stable/13 - freebsd-update: create deep BEs by default 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 80f747781f125576de40ab8b3d8d70b351ef0518 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=80f747781f125576de40ab8b3d8d70b351ef0518 commit 80f747781f125576de40ab8b3d8d70b351ef0518 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:18 +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) --- 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 c6432dcd6b0e..438e13a51154 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -916,7 +916,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