From nobody Tue Oct 24 00:04:53 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 4SDskY5bt0z4yf8n; Tue, 24 Oct 2023 00:04:53 +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 4SDskY47tzz4GbS; Tue, 24 Oct 2023 00:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105893; 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=aqaCd/acjRS4O/YWgRLueRWuEr4X37AIs6SSodYdX+0=; b=BMUfSzZfYUPfrNkmtkTihj93T9ZelNynAn/cAz1kbYnk9c3PQ53NtPqBOSf7+BebLKMqbs ZFKJtk9/KVsOERHsGMG1Nu9agLMPMhij/Mq+T+TVGxxpD+bT5MMPaGJNSPFBU3N1fkPGVJ gJy/I71vtmtmmOr2vyvghBO6onhSNTuFWJnJs4A9j7djguJOWBZjbJi/HWPSukMDE+3nWF 06YQtI8SntlWyGNUp1kwLvP7eLOIY7sRz+hBuAzZ1Oxb62b1rCFuCvYMhh5Y3nQNZegfU9 i1HMPTdzv7lbf11DgkeT/btWHhDj8TbK6LTi2Sb91XirtYfIGtkBwFmapbS9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105893; a=rsa-sha256; cv=none; b=a6JOMZGCeqKJJdghXapYB1mSogieS0oLKkE0WeGqSeK2MMkvS+LOWnLccugIh4AdsOqqOV KQ/c0JizF/G2FrEx0IxgX/WxqlOHDDH6GEjUNeur86ARMoZHqPtI7jN68+9l4kGRbnwpPg 9JmrXaoFSNJN2CBB7J55Sa5N7NljejE/RHbmRf1SwfJXHIBSRGb1ryx336SLQRNCDI2giE r5scxCUjZ0YAClBVx0OUQ03xYi01oVZsxwDXmVe8GDnaJM6trov5zV1D0sm3H8hwKD/KmY atotsXFSb4MuPOXZwVFm4iY6PYkv3OA5yzeS8HY9Ck/4fS+VydR9SCjqw83vCg== 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=1698105893; 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=aqaCd/acjRS4O/YWgRLueRWuEr4X37AIs6SSodYdX+0=; b=PFgmB+Vjybv90y+NRnurkklVy/tFu9+pilPff8gRUMgo2+hmmeBaAfhzgu5e2PPch6xNo4 A53/JjY0+VirS9z7hp5MvsC3GL4aEgkd5X5Rz+d8Iusq/dwTcBTqtHeJfzax3G6jNmSm9i A/O9xCXogt3TYXyNQCBrcLxGjgdItmcHQVCYOqZgqAJMycNNEh0B161Ltqcu8xrS1IIiFd 2U8nVYDmjLOtFUkhSRL6MWpGI2v3jWzoblH+BoxxE5xsrALAHaAREQlwLMSLciadRhf0Gh /P+cpfJZiY3kdma3SDPa4g3ut+gODO1QCZxjqshOdsIdJqJqpQOYWsvlAtyDwQ== 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 4SDskY3G1sz10Fw; Tue, 24 Oct 2023 00:04:53 +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 39O04rW4037763; Tue, 24 Oct 2023 00:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O04rwX037760; Tue, 24 Oct 2023 00:04:53 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:04:53 GMT Message-Id: <202310240004.39O04rwX037760@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: c1c0873c9d3f - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: c1c0873c9d3f6c05168303d0b95f9363c1e6c371 Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c0873c9d3f6c05168303d0b95f9363c1e6c371 commit c1c0873c9d3f6c05168303d0b95f9363c1e6c371 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:42 +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 5a523775dbbb..f89ee032e1f8 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