From nobody Thu Oct 12 02:54:13 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 4S5Z3V03bZz4x5rf; Thu, 12 Oct 2023 02:54:14 +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 4S5Z3T6fXmz4MLy; Thu, 12 Oct 2023 02:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697079253; 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=QzkHtBNeJ3AJsx6PQcFDoruuzqdgAuQtyJ7rM1T9yso=; b=QzcjBoG2rBDJ+k+cL87FMebLNlX3eAyFS8NMB6wYMWOvzhNPmPvy0JPJGNJm3mmEwNmrCO 83NyubLzsXI/vBFzr8lbJC2J8ihvezUudpFK54WJKJ+cjsos3JCghR2AVcGnh1MIZ+WCYW UgqrDitEeFJMLIrwhx7DKSnWWecaBumrhnPwki3J2Osh9yeF9T6gCP6IaPaRKe01DGBQ0m oowxiJCU8yyiLLz1INJj/etAvims5rSM6uRNWiW1e4oEHmxXm5SBvlsbucE4Xd7GwRbzrj vQrrz6YoaVTdUkQyOHPJ19Quclmhud+cB38bOyFJ/PmpW7eyG/Eb7Kx9yXV0fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697079253; a=rsa-sha256; cv=none; b=AuBWS0eQGPNIa87MjieE68EpcQpdX5qJd7q5UNLS+5CLE8R+TWItrbGNXpWggIvXgfzx6V F6vpL39M/J9LbjHrBt+KyHaSNekFNT8zOCDg4QC5g6mtoEgEvmKFjSe97wSJSIveHEaLHs MpgOiIZE8YIwDH5rn6HJ9YAXLKv7EjiYS5RHlOj75RvyR6AKqpY4A7RT6LFz9tFtZ5DZAi 6jENEL3YpxN/UUfjT/gcCD6lBgHp+v1lZhCCtYdANJ1xXthEMY5pwAnyLzfJmPuQ0/SF6m tHzNYKq9E27QrvxBgbJsCstITqEdkNXNExenVImH5bV7k+iBjUqgonB9xehvBg== 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=1697079253; 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=QzkHtBNeJ3AJsx6PQcFDoruuzqdgAuQtyJ7rM1T9yso=; b=IrnkZHEgMPOXCqSEL5hXGcZpXS580kQ82VWKZOrGfhtMYlGVeF7gJ06SnE/xWk/vCbzYLe gE3dIHjCXLTOUbKyfK149zU3M50QrABEfbMxixQgqgRDtlzWhcy3WOW7SEzXIjB0TdxDdX PZzgp7Kqx4GDVkewOUtfTDK13f9sdLuad4eLiXsXSALCIk/5IKObEOmaia/2oRXjFo8zWY G/UIRC7srnaTTxL7sfB0Rv6m/vY505U1+xolYcY87TQUe/HzkyBFgpmk64KbTDX6hBV2uc N+M8aqDVHtCooGfvQMTc0CwBQzjq0NIUWK7H8D9zS5kChrJV4Omul+PjIEfa7Q== 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 4S5Z3T5hqdzmxP; Thu, 12 Oct 2023 02:54:13 +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 39C2sD1x039070; Thu, 12 Oct 2023 02:54:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39C2sDYb039067; Thu, 12 Oct 2023 02:54:13 GMT (envelope-from git) Date: Thu, 12 Oct 2023 02:54:13 GMT Message-Id: <202310120254.39C2sDYb039067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 989c5f6da990 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 989c5f6da99081b1f2b76ec09e91078e531e1250 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=989c5f6da99081b1f2b76ec09e91078e531e1250 commit 989c5f6da99081b1f2b76ec09e91078e531e1250 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-12 02:54:03 +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 --- 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