From nobody Tue Oct 24 16:12:12 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 4SFHBh66lqz4yCpW; Tue, 24 Oct 2023 16:12:12 +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 4SFHBh5hZsz4vvM; Tue, 24 Oct 2023 16:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163932; 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=OP5X9xtLqlJcOxvHhbb2XbJscbkrl7RtdMHp7lZojKI=; b=ucVaIHeBBl+lT5ChfEm4jdv4+CjFQCyhocRkLjtH3nuRzXN/NxWaiMnhOjzxUWxCJp7RXc okUijcqrkiCE/floGzEonuyAXOkS1SGTC/bPqjjrIenCkYMy+X6+NG8CzhKd7+zyxo9zEY E6gezyEUUHbD3+M47mcj+mM2QwoEUQbXxF3tfr6Bic0oBmhtT8/qi5ZzDDpKLJGMR51ByN 50+cOK5AgyhjkzuzQ69t49Q9kPp10V6BD8mSK1aRenl2cGcpCEIigsl+tc0oYiDHRYPTLO oRLt+aIINScZy3RXUiCGvxQFJ6etkKxzxEcBIkIPz++OZFyofkqTwLerFZvCpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698163932; a=rsa-sha256; cv=none; b=Atx1VxbLFNb0m3bIaPolZx2CnKsF8DrYtgXCQCABRnOU5ux7DLMI7PGuBXbHhB3N3o1cji qChq7aHtmYnTBPFiogxRPubguPcWwJ/hESi8ZBxsC77Fwgf5x14tFyCJcjIH8xHqpuihVQ DSt5X9jFsEx3bffGVOleU04oVvN/Cjwijlj9ClB+fDuFZeL5pqyPVNJmFaWf/d5QlgMG// T0h9s5UBK7C0kzXaJ+FEg7tB9WjRisJtjMcWyFRToTszpSo7JDVpaftVtGDPDtFw7d8eD5 tdBGLGca3YJbCljtVTRCRVj4eRjM6jSQiD8+fuWQHrH0eHE+LPSw41fdB6mwxQ== 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=1698163932; 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=OP5X9xtLqlJcOxvHhbb2XbJscbkrl7RtdMHp7lZojKI=; b=I4y9NzMe/ol26NM5cZYckROD4xsN0Lu4AgLr5zE+niylVKSePku9YH/LOYVMMWwEw0idky d08d89MrcFjI6nQa5Fa/5rl15s2Mml9zmavJzJ23RNR+oK6hgfg5EKYbA8ROMIcYBDns6y itFYa6aUe1AXyzauGtwRDVYSQTOMSfAhvLyq96cJTO+uZ8tuq+powPKL2MZn4xdXdAKlp9 flCamm8JODsrX2NIpgrfpo2aeSI0IOt8B2/2sGvi74pr00qthvYavma1LAJXFaZwgUcThj s57nPzgd22NiUZnfW6iOrmO75YVh6xqYjEAFofZjp5wbaD2UJT3LSoSiwy6wrQ== 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 4SFHBh4mWHzVd0; Tue, 24 Oct 2023 16:12:12 +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 39OGCCBZ053908; Tue, 24 Oct 2023 16:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OGCCVf053905; Tue, 24 Oct 2023 16:12:12 GMT (envelope-from git) Date: Tue, 24 Oct 2023 16:12:12 GMT Message-Id: <202310241612.39OGCCVf053905@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: e34fdb7c119e - releng/14.0 - 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e34fdb7c119e2913d0910033e6a26fd6c08b9503 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e34fdb7c119e2913d0910033e6a26fd6c08b9503 commit e34fdb7c119e2913d0910033e6a26fd6c08b9503 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 16:12:01 +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 Approved by: re (gjb) (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) (cherry picked from commit 5c2a559876d123ba386612319bf42e7b32dee590) --- 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