From nobody Wed Feb 11 15:45:52 2026 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 4fB2p84hKJz6RhGV for ; Wed, 11 Feb 2026 15:45:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB2p8288lz3tcd for ; Wed, 11 Feb 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770824752; 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=HH3YXV2SWlHG3wlW6RuTZ6CaV3hUN+WeHhOAoed6AGw=; b=nKRdJTaCEKNAbRb6S0XmmVjiGxSCZQRfGcPJGdk2VVI2Zb+yMekb2Ed6ps6kJIL8TTTKqH s10XLniIuBLEJA2lVEfmJlz7lZmKfRTNwpqjokxVPnobrt441gNGIoGMmgxs6gEf/tGeG3 fIb+ZDi/qahgNDI2i+lFnbZndaSM7rCUcZ+x5rVqKhV9NsKQpI2TDYp1Tasvxh2VzGFzhM uSa1pkcOgdJwj1wkUIz/t49Jgrp05YHZYEyo2vQyNfxVa+Cs13UJEfgZEQV8oKhuQGtFxE 6PAlJcqtCXgO1Y/AGzMJAggsq1NPe2n2TgWQV4AC6j67rsrYcmu73C6qg3QpIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770824752; a=rsa-sha256; cv=none; b=tFKwJWiOdCJzFGa7X3a05FO+W82ytbgPbkt+uyOI9Ba+0Lo4M9QObKC+5PCrdsxhiwzUys bcJL5eKNFnh245QoGKcZMM20BYeDH45EoSOe/GhWPRE7VJeKt4Yin3CTUqoC+SYZHCIh+6 WKWMGOBXeruitAejIfWMjxbrJhg81ernw8qZumdCZNZmFoEdKTDl1Qz2EGft/6gxv5kJC6 XqnVgJpanyPxCY5k47j/frFNdsJ4jeh0wsD6QYFHXM7CtgDkZ6JjKMF+20mwRUbJzzYqs0 q58Yroyk5PexMwhPtBd1Dq/zMKPh1QgXJgNyZr76US1o+Nelb6jqbCEiCKjphQ== 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=1770824752; 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=HH3YXV2SWlHG3wlW6RuTZ6CaV3hUN+WeHhOAoed6AGw=; b=k2d89F6IxDZaWLlQbsRoy1T4Hiryn1+ri9YFpg4/oKRUPusyXCWBJIGAmWjSOJ7O/c0Nd1 edkfEm2yq0dJQyRNdPfwHRvd8R15RWB2P4UMBIziij12ND25vo7laAYEzmbQbbaDpogdAG TF+kTwqdIeoMP9GxjlY+xFcUHK6Cm3FVXmLQcu084cbAz2WE6krpGUDjP2oDHsnkccPTRU 2qe2RxYFqET5xzNRtIDCg+ESdA6p5tRl1rciki23BZbwexsTUehOy2O+B05JvZ2qboWohD LyoRgb17fZeBkeI9Ncnrc8ikMPOaWR3Wn07t3mVmqJsmhG7FgVmY2msrrsn9KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB2p81hYvzw3x for ; Wed, 11 Feb 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22081 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 15:45:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 097458ac665d - main - freebsd-update: Error for -b basedir without UNAME_r set 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 097458ac665db732cc91a22279da4cc14f694da2 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 15:45:52 +0000 Message-Id: <698ca430.22081.5723249e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=097458ac665db732cc91a22279da4cc14f694da2 commit 097458ac665db732cc91a22279da4cc14f694da2 Author: Ed Maste AuthorDate: 2024-12-10 13:47:34 +0000 Commit: Ed Maste CommitDate: 2026-02-11 15:44:45 +0000 freebsd-update: Error for -b basedir without UNAME_r set freebsd-update sets the currently running release from UNAME -r, which can be overridden via the --currently-running commandline option (or by setting UNAME_r in the environment). This may be invalid if -b is used to specify a basedir other than /, so error out if -b is specified without setting the currently running version. PR: 283229 Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48016 --- usr.sbin/freebsd-update/freebsd-update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index aa42af13a302..a58b50e9ca2e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -755,6 +755,10 @@ fetchupgrade_check_params () { esac chmod 700 ${WORKDIR} cd ${WORKDIR} || exit 1 + if [ "$BASEDIR" != / ] && [ -z "$UNAME_r" ]; then + echo "$(basename $0): -b basedir requires --currently-running to be specified." + exit 1 + fi # Generate release number. The s/SECURITY/RELEASE/ bit exists # to provide an upgrade path for FreeBSD Update 1.x users, since