From nobody Wed Nov 8 01:00:36 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 4SQ6Fw2ZcDz4yxdc; Wed, 8 Nov 2023 01:00:36 +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 4SQ6Fw1vMWz3TCN; Wed, 8 Nov 2023 01:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405236; 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=nypDRlbtmv2H3ZjaooR9jI+e29NziSI35hpv77VJXbU=; b=ZBVzLy8mjjnVUQ8/LBKwFZzwqpurP7RAN1gZg6aO15iTtbX84M5QzLWs2jP9eAnPtNBgOR vvF3kCzKhcVG3AwnfbCmjrAftkqvirkdp1C7NjOvzAphZXxw2eENZBHAXR4NgXDySlip9j NIVoBgaW4oncEDZ3FstD2h1hvyZSegtgXfZwbJ98Loj6upNU6d2vGmxR08WZ7BVOUsZ9xK K3voyTlcSpg9fqapdFBue+uCKIFf3mRUme1AeGsWGBBIPAkPsJ1PACm6KzFre7FevcVt1M VPMEu3qbFarQmXRTfmf9/Uj4Ae7OOrW2cF2ig0CDtlcZyPRYjaDKI0TwY7TFbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405236; 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=nypDRlbtmv2H3ZjaooR9jI+e29NziSI35hpv77VJXbU=; b=XnTrpfqWBDXjOE9qpz+UM+dxSwkeW3pcY3Qy5h+RoS80XkY4/6Tb80JB0T8s/HUwL8makp SiuSqF/dfHW6XWaDjKyLsa/n6kWlJ/i6WKeC9UI8EfSx27PUvFk/5tR93Q7DB+YLyrdDhM ygl2evufE3yR+HTc7gr5oOSvb/ZZUDI+juehdfhtEB/N3JAGgjg9n9YAnJBYjrJTUqWbc4 BTExmXXtfziP4mwqH/G004c6Fm8ETNbCEnfZC5dNp1I+V3X8+y1v8kUa7FgBtJ1jWB6x5j OA2XHXJJK8y6F2T94Ba8qDEpN+27vjhtzzMpoBE+8YhaeNux3b7U5MAfuX5xag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405236; a=rsa-sha256; cv=none; b=jKW/XY+9RL8rG50iNBbZlMeUSUd1Ws7t64Rmkcll+BtVeAkUMDmtsxGB0+T3TfCPRrwdF7 EKX+p3vjDKtRExrmd7Z24zG4S7SDzNPyFFw2g2x5koQx1owRmFvP4NfRRXZedWFruMBY2v iJi3VGITLfdmIqukgHPFneBkaTcP5u+8sp5Hzy3d6doHvNxiZnJHsRzpRVAFXYvLD7rsiX BDecWUqgypHcwVTAi5886eXlWnepSQOuFoxO5zze108w8nZQdJgOjMzFl4iVMiNu8ib7HP aeQxIMPV/EV8Go109AXeunSN5s1noJ3d8ThObmqcDb+JqOGFTT7ikpi9Uk7fsg== 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 4SQ6Fw0zYhz1C5k; Wed, 8 Nov 2023 01:00:36 +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 3A810aOv098098; Wed, 8 Nov 2023 01:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A810a2h098085; Wed, 8 Nov 2023 01:00:36 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:00:36 GMT Message-Id: <202311080100.3A810a2h098085@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: e79edfaf68c5 - releng/13.2 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e79edfaf68c542c8545670e911ae83ca0e3493b5 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e79edfaf68c542c8545670e911ae83ca0e3493b5 commit e79edfaf68c542c8545670e911ae83ca0e3493b5 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:59:45 +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 80f747781f125576de40ab8b3d8d70b351ef0518) 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 0c4053715b70..42cd2087a3ba 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