From owner-dev-commits-src-main@freebsd.org Fri Apr 23 16:45:04 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53E495F8E62; Fri, 23 Apr 2021 16:45:04 +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 4FRgBS1zWHz4rBJ; Fri, 23 Apr 2021 16:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3700510AD6; Fri, 23 Apr 2021 16:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NGj4Qb056228; Fri, 23 Apr 2021 16:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGj414056227; Fri, 23 Apr 2021 16:45:04 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:45:04 GMT Message-Id: <202104231645.13NGj414056227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b0df36580d5b - main - etcupdate: Remove the old pre-world tree when rotating for -p. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0df36580d5b0df67a0f58ded8f6356b268f7f71 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:45:04 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b0df36580d5b0df67a0f58ded8f6356b268f7f71 commit b0df36580d5b0df67a0f58ded8f6356b268f7f71 Author: John Baldwin AuthorDate: 2021-04-23 16:40:04 +0000 Commit: John Baldwin CommitDate: 2021-04-23 16:44:18 +0000 etcupdate: Remove the old pre-world tree when rotating for -p. This fixes a bug in an earlier change to move tree rotation to the end of the update where the step to make room for the new preworld tree was deleting the old "current" tree instead of the old "preworld" tree. Reported by: olivier, dhw Fixes: 0611aec3cf3a373e6a06f103699dbc91c3d6d472 MFC after: 2 weeks --- usr.sbin/etcupdate/etcupdate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index bb9eb00bc646..254a72abae08 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -1644,7 +1644,7 @@ EOF if [ -z "$preworld" ]; then panic "New tree should be rotated to old" fi - if ! remove_tree $old; then + if ! remove_tree $new; then echo "Unable to remove previous pre-world tree." exit 1 fi