From nobody Fri Feb 27 19:59:21 2026 X-Original-To: dev-commits-src-branches@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 4fMzgF5gM7z6T6f0 for ; Fri, 27 Feb 2026 19:59:21 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMzgF51Drz3V9R for ; Fri, 27 Feb 2026 19:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772222361; 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=a2jV2DJHTm1LTNeAPtCfV0ByWpLWEexzI42BvOBx170=; b=WHx/Zgp85N4jVvgumr+KP+yJy+VUFYfE1+K6UFtVZnVvh9EdhW29Ebt9MXE0MsJRVvx30I LQoe4meLcnwvFSw2W1w9hXrV7wqS6Gu8JSXcVhGBRkLUZXgM5irVTZcHxAk7bGF8BVvBHk QD4W8OoUqIyjjrgNDVLXLY6tQ3b0C/78RpYNqa3lvcClTdyZfAZebvCGl4+DIYSqlBBV3O 6j6BJBkfuEY04G0BkgwA5We9qqQeSpeHnOuWIP9x+lCW8c0fS8LEayW/XOoR3lzAiqAG8h 2r8/4ySHBJk+fjSD05+wsnhQzfoCuzc0QssOdBCtnjr22PkayRwD9kRMlmEn/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772222361; a=rsa-sha256; cv=none; b=uqHymklLRO7jxm/g3FYSdRYVnQx0orDgl7w52kAVXotausn/9o77qyI4avtmc9JGKG6/Hc TJAa6y1DRsb+aagLKEiG7uO6ojRUj+lujbprycGQ7jJpe8Kdi2kDlA3cIDm64g3KaLsnIP NrhpZzXEc4aZKdMYKJRRU5DShtNTnKvDvRXynVHF34ELiQWIYKXXPFitKDzCf6LyTzoV9D S69zKWw6l0ATicRLkF50LIgelknbtAqBy3yZv0yZ5f/ey/ekwIlOm4VQ4bTai3oOmbOSFV r/EnfHYsBeizCmS3VS8prXjVzlu9c1PKMeQbpvyJRhJFiSrWO3m+2RbED+MHhg== 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=1772222361; 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=a2jV2DJHTm1LTNeAPtCfV0ByWpLWEexzI42BvOBx170=; b=qWWgmQok8yFWqaKn2RCh7vqmeemG7LtXBZrtGE4XkaBj9RZnXDUpdHBuDWXYCc+oxoKPOV eraAd+1zE0l4PVq6PGdot7ATZX8leTZoZwzbJr86vuyU9J0BqL1eZBi5rSzVv4TDgGd/+q 4WeTg8UV2U5NGJ1QD3TT4AFeH+8/ryC1ursBpUedj3Owtlf4OY4BGzwwUAD1i97ioUgRY5 /CVjNekLkq1GkUUUsLgK4MzFQwQ7xQvigpy4i4cHbVErMHfQfUqDTQdxXvtjvuFJimBUxf 1MDqjj+xxKbWLhVT1bgBMo2MQyWw4wAX6zddjhqjEjB5g74fxAKOiazpuAIbMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMzgF4B11zXVJ for ; Fri, 27 Feb 2026 19:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 205b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 19:59:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d37214da968b - stable/15 - freebsd-update: Error for -b basedir without UNAME_r set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: d37214da968b8f381e7b67f80607e0865d873f5e Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 19:59:21 +0000 Message-Id: <69a1f799.205b6.5f6d8dee@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d37214da968b8f381e7b67f80607e0865d873f5e commit d37214da968b8f381e7b67f80607e0865d873f5e Author: Ed Maste AuthorDate: 2024-12-10 13:47:34 +0000 Commit: Ed Maste CommitDate: 2026-02-27 19:59:04 +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 (cherry picked from commit 097458ac665db732cc91a22279da4cc14f694da2) --- 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 d9db4fa4bf6b..c77f4b18fc61 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