From nobody Tue Oct 24 00:04:49 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 4SDskT3Cmcz4yfMw; Tue, 24 Oct 2023 00:04:49 +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 4SDskT2Qs4z4GNX; Tue, 24 Oct 2023 00:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105889; 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=4yCDTz0eA3m6VrYgBvDDD0q2Ai2+eV+iTkX0P1EMZ5A=; b=dI0KAuQm5CVUjXehsNQA0YZq9B7UrH3unejSQq+ku8Zv8kDTQhOvuYLwlyyggRqxZ9yue/ hYE8Bfc0A5JQQKsC+N0HS3Jm9ljaCG9pYoSOLqKCrUP7eNqbRwIAsmfQ3ALptCDqGwPp3p IoWiPR71GA96Fqk8sR8iUStvaRlmxpOxx+oow8IGaQ6lwIqYE6iSKuCR6mhojJbhdZWoqd Z3KlrqVIIiJtGGbelwj4+1PVLXwkSLSgtT2w3Y8kudsT0LyJZQFjY1hNCVoS0fvlDAIgwt IFx92GKB9g1TIPgieEmkieKvdMmZNO1SwnDx5IHN3td7pIcIEiGr1sy4amrirQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105889; a=rsa-sha256; cv=none; b=EaXq40ILvHO51Bx1nYofNco8Dtavwve7FcBtv7tY4nq2BBb78QqkS/JvYUGwmaZ1J6r5BG C4nrfm3UrrJNrlMhSf2C+uvatO8aj3eZYJdw7GKR3r3P97h7FjNvx0yktlW3vA9JYphfqe 4JYuJpnyQ6hlLwyqGucifgjVacSNDrKPwcSnidUq5DtfVgb1PMyQBKfxphsSsF+BK9Tisd Rc5akYfv97r2eCaockp0u+2ZqIkvg5GB/Vg4l1WSk/3iSMS8neFAeDf8VLYbknW9qHr4eh bQWRcHDCCklX9Ssx626m9YLx4gq3E9tkNfvTdfZ4Ezc5sYw2kLZpowC62Y9lwQ== 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=1698105889; 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=4yCDTz0eA3m6VrYgBvDDD0q2Ai2+eV+iTkX0P1EMZ5A=; b=lwPnC944dkLh+sIyWqOYG8b/VqixZaehsB5v29in6Gn2+CLZg1XIB45+bnUOZn+ShaJM3G AJ54Q1CMEAVq9KMxUu+Kz7Dv0FneYJNdV2h+X1jl833vb50y/8Lepkr1VfhGnMjFtBY28n w/GPSal/dXGrTp+I0/yOndsfYRhqYOA1r5oe2aSyOcjppFFwPdk4ucjmnxV8VZwMM0DunF zD4floKUP1pwsN9C9w3Pgb0q9VIReAIAEkxg3rd74wHlbeTlycrzimz4RWF6ugBFqBH9c/ nipOxHLnU8D/AWIwHSEXu4dwt4nNSUjfhW1HYuEAFxYGQ8jN89/BV3ZK+bYT3A== 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 4SDskT1J0tz114x; Tue, 24 Oct 2023 00:04:49 +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 39O04niT037616; Tue, 24 Oct 2023 00:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O04nrW037612; Tue, 24 Oct 2023 00:04:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:04:49 GMT Message-Id: <202310240004.39O04nrW037612@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: 5c2a559876d1 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c2a559876d123ba386612319bf42e7b32dee590 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5c2a559876d123ba386612319bf42e7b32dee590 commit 5c2a559876d123ba386612319bf42e7b32dee590 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:14 +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 0cfd29731126..f5289e1cd9fc 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