From nobody Fri Aug 8 13:00:45 2025 X-Original-To: dev-commits-src-main@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 4bz3zx51jfz63mVm; Fri, 08 Aug 2025 13:00:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bz3zx4GC6z3VG3; Fri, 08 Aug 2025 13:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754658045; 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=o0JRE8Qyns6saw8iL7F514l021Lotxil/qm2tE4TDVk=; b=PKrj9y+e0BQYQNqnQCRGuBwpBXwMaWPIOOffva57SxkWgIg8MXajSanV+FXRIST9C1Zelb x8NBZqmXzz41LeQiF0ATkeUqhuw6ckRFzua6QLKZUMPonLuVTBH/Cx6MmXMX8BBtbpQLzY pfDnL4XVnjZ8R1dTIX0+lRFdEMOUACa0tpN/KDKoRkKqb2dPKCakvRWuLY7GMvzNJxRy+8 BUfOrSHYvBiD5o2pkZItW0K/J/GReNwTOscmWp5cn2qoHRk4UgAAbOmxCxqrg1qkr38Y6W IpAx2IAoO2O+ocvOAure5EhxHC1YXU1V5WSTIJzFZooQQ5OQtI7X30V85OxLcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754658045; 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=o0JRE8Qyns6saw8iL7F514l021Lotxil/qm2tE4TDVk=; b=xZTgw4cSIXlo4MmjulM4YzhpQchpRhlK6Xuh1qmCyX6IDUWQtFIusI33vWaRajMo8IRlR9 3IhRdATJ4xpggz2xmd9HNHCVaHKilsAUIC8i+wX5JIloI0CrgfQP1lpunIUwYH11R4XS13 WUPJe01r9yYSn38mv1KZTZXh9KfYmnzQqAEkwTuARBgv+AcyQCVzJlWc6cVvhURKcXb+2x WXTZ/6nse8rjroTrotiPYvmv8w2PnzcFnPCcCSOrGM0dDerFC+a3L09R5IK4Dx6BBHthNu jhwcUQWHaom/zN5L/5maPnA6NgOey4nOoOqS29pabV1nciCBW7C+kjAvfJ7bOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754658045; a=rsa-sha256; cv=none; b=TJ2QvWfpb4/yvlgBAZEGK/xOCO8xoCSB0FnZCBaiFhVCOeoBuoZZ2uUOumpRTdnsTWH4rO zdUt0QS7hpdMKeONmJoNd8zByHM3bpECYzA8Lht9guVINFUQsXaBbQ1oM3kb89Exgjmerj bi40fnDjWooM8w5pvCIoO7XpzZBx749SflDRjMvaYBIweoyZMf2CEH/qvGdiVOJ8BlemWg wjPQlYuADSAlJ54ETkrx6XOjs1+dC2IMtCCWl/fNMhU4ZEGW+4j6uWuZMsrHIcwOWWPhAW JU8yUgLSAGQ8p3yq+gHq8RlOBda4y91FF8QUl04fbIpu0n6v2Vwmu16Q+/bq3w== 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 4bz3zx38q0zd1N; Fri, 08 Aug 2025 13:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578D0ji8068660; Fri, 8 Aug 2025 13:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578D0jIl068657; Fri, 8 Aug 2025 13:00:45 GMT (envelope-from git) Date: Fri, 8 Aug 2025 13:00:45 GMT Message-Id: <202508081300.578D0jIl068657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 66c75fa63aff - main - freebsd-update: Fix the pkgbase check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66c75fa63aff40e9c587345b2cc6b8148e396de8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66c75fa63aff40e9c587345b2cc6b8148e396de8 commit 66c75fa63aff40e9c587345b2cc6b8148e396de8 Author: Mark Johnston AuthorDate: 2025-08-06 20:36:05 +0000 Commit: Mark Johnston CommitDate: 2025-08-08 12:51:54 +0000 freebsd-update: Fix the pkgbase check Even on a pkgbase system, it should be possible to use freebsd-update -j to upgrade a non-pkgbase jail, at least for the time being. However, the check_pkgbase() call came before get_params, so BASEDIR was always set to /. Make check_pkgbase() a pure function and call it after get_params(). While here, use pkg -r ${BASEDIR} instead of pkg -c ${BASEDIR} since the latter requires root privileges. freebsd-update is supposed to be run as root, but it doesn't actually check this that I can see, so let's not make that assumption here since it affects the result of the function (i.e., pkg -c ${BASEDIR} always fails as a non-root user). Reviewed by: des Fixes: 856e158dc4aa ("freebsd-update: improve pkgbase check") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51770 --- usr.sbin/freebsd-update/freebsd-update.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index ccd98a883dca..c388e76644dc 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1099,24 +1099,19 @@ IDS_check_params () { fetch_setup_verboselevel } -# Packaged base and freebsd-update are incompatible. Exit with an error if -# packaged base is in use. +# Return 0 if the system is managed using pkgbase, 1 otherwise. check_pkgbase() { # Packaged base requires that pkg is bootstrapped. - if ! pkg -c ${BASEDIR} -N >/dev/null 2>/dev/null; then - return + if ! pkg -r ${BASEDIR} -N >/dev/null 2>/dev/null; then + return 1 fi # uname(1) is used by pkg to determine ABI, so it should exist. # If it comes from a package then this system uses packaged base. - if ! pkg -c ${BASEDIR} which /usr/bin/uname >/dev/null; then - return + if ! pkg -r ${BASEDIR} which /usr/bin/uname >/dev/null; then + return 1 fi - cat <