From nobody Mon Sep 8 13:14:16 2025 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 4cL6qF0Jnmz66bnH; Mon, 08 Sep 2025 13:14:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cL6qD6SC2z44nl; Mon, 08 Sep 2025 13:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757337256; 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=+KONYz7wcGsNEsrvLRtLsl5LZ7y7dBjOWXnFDaZPo4k=; b=NrQ3EEbql7TsoagiQ+0C3i4hu1t9fGH6H9coxRdYU2r08VOvBIYWq7hXgJ8OmSe5cWJiRx EVZJHElB0aTC6mnc54fwjsQcj/8UNgNY9ifqtdey94bJj75sqWFbaztm7LaaqEjDclAd+k TUKDtb7fNtty7iH1/a3+YVVt6ISy6oCICsUullvUFilmMU1on4noBJcHao9qY9sOWeWWw4 W2I+OwiuHScOeq+6PJiYTE44OIt9DVvH4CAtt/IPD4vs5Ise/UmyY3H1nP16wfuAlvWpgt ONpHhhkk1qM0N4X+TwZbIvm2lGk+J39E/HxQ8uK2FhScPI4oHDPNyq/kSnnN0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757337256; 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=+KONYz7wcGsNEsrvLRtLsl5LZ7y7dBjOWXnFDaZPo4k=; b=f3t1FzO1EJ2BHq9Go3bnrDA48f+t81O8BmMg9G9ESWy8j4URI7ckD+uEqu8VkdSPdDN02F esU45tbrGfv+xtAh7KCHkhu++pvoxWvtlLLT41CjKAMMw7dpQRpaOv6wdSkn8e/1D0NmAr o4ANzHXchN3ZYNPXwcTibBd8IBP5DYxg1Jf8w6W69y74uFOv2YNL33Okn/7wNQOvdtal9q lykWOwOoUwM38NyOdmOsHQzBk9DgouveOviF6L4ktBZrlaIrdabXCU04ntmr5eZTnpZUfK 8R+L3Di1z9YKbls35qpAYrUejqONdmaofEzLNviunCWxeJjc78VJVx4rYsfsxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757337256; a=rsa-sha256; cv=none; b=CfDtrn+rUztyVoosMcAQx6AJDCK+h5lHasQhn8eUAyJdMWewvH2aTrX17Kub5ng3LB7lw2 s3uwDEji50IStQAYPx3xmMmBuEMP895A4sQ3TrBszHypV9D7P7QwvCiJ8w+qhB8VMFWx6V LJssEybEKTgATXJWqrcP8glK26h3MzFNwDfggRN2cDWKw+VM41jynzjwcKEa379SM65GKe 2SmAXGU+QQzpWm7/N5OEjVIEXanqGgljST/TmovkgFAl4D/4TPuXlg0Kttken1yVE2WdCs evntF5xzaxC4sCJZjxozzfFIMfksjsHTwptkXtJnAkY8vxWG8ffo2QIlxsTk6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cL6qD5w02z16J8; Mon, 08 Sep 2025 13:14:16 +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 588DEGVh030664; Mon, 8 Sep 2025 13:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 588DEGJt030661; Mon, 8 Sep 2025 13:14:16 GMT (envelope-from git) Date: Mon, 8 Sep 2025 13:14:16 GMT Message-Id: <202509081314.588DEGJt030661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c9467d0b562c - stable/14 - freebsd-update: Fix the pkgbase check 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9467d0b562c03a10ae358922eec6427bf250d03 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c9467d0b562c03a10ae358922eec6427bf250d03 commit c9467d0b562c03a10ae358922eec6427bf250d03 Author: Mark Johnston AuthorDate: 2025-08-06 20:36:05 +0000 Commit: Ed Maste CommitDate: 2025-09-08 13:13:45 +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 (cherry picked from commit 66c75fa63aff40e9c587345b2cc6b8148e396de8) --- 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 8ec380bd2f17..543ca9319da1 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1046,24 +1046,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 <