From nobody Fri Jul 25 15:34:05 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 4bpX3K2TJPz63DwD; Fri, 25 Jul 2025 15:34:05 +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 4bpX3K1rKtz3y4d; Fri, 25 Jul 2025 15:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753457645; 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=jaJ6vN40ogy/oxRb6U9YdFh4mVYTBIM3vnAR6cm0oD8=; b=Sysr1klc7XiDgCm3rA7RkWNYvHvX1syQU01XjG87MAzO43cEZ0WkNPXpjA3X2DkV16aTrj Ld0hfRsqA8ATpv+8/E4ZLpsr+6/bMsDeUYAE4C/1MYjcA6qnZFKbtUdwVqLxgZLda7pIYd oKdSzZiujvD8bF3yDqqiSyXgqzt6y5K3zB9cLnUDKw4HSYe56K6UiBJzSST9xhYIFtjXeY OL6IRHUS52b/f4lOLTeCfySOLgv4QaTY2Jyl6iyzkPHjSXiFkbbQyrzSMI51PJgz9k3BRL iOtyOVFIrqw3EYvou5H9LSYFm8vzae9g/Um1ZeBE7L3qEhV9jhvWaPai3sbtqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753457645; 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=jaJ6vN40ogy/oxRb6U9YdFh4mVYTBIM3vnAR6cm0oD8=; b=izUAdHtVW8lThah4MYpWStusdCHxthfOW/m97oQZi7wU7ha0rnAENmav744f+BAXkTqf4i KuOHXyH+WVBYx5EDXGWWkh/qyrfV6pDwIFGSeXYPF+pcuem9oruiaCjRB+QQs36j8pXWV1 k2SYOy1VDqm0CQI1vYBwT2CTdrCCtAtjedkGnGtxIM2T2viLXqoTUYVcXlRbJAlAA+H686 A0AIg6VOl34vmm5eLcpS6ef/dcPSoKfD75LlIYpaWlc64WWlXZM1512m1X2aWuAoxgi5rN iSnhN6MzVTH2GNY85hL823nu5BHwe9RhiG0mVnqefriEQ+eKbDzBTa/+PY8PzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753457645; a=rsa-sha256; cv=none; b=sqaqTiuKgJYhFASMwwkbqXyzVLq2exS8QmqYm79TcaWs4Vyq7PAQHVeWnadyODYCWW558c ZP+JVK1VXn0MXKjldIInHBdvl3/w7YnmNzuZ6WhHUFCdPJZiKHsbPQMD+SOBwzDCJ/75Jq UhQg71WjX589gax9ZHpntRzg2kc9czOyH9ItYfx8nwYxEkAs7ChRnj1G2D6CnFVUdvhw2v r6oEiGX3PvNy1NWTsttHNyj9x93buyVpHqwqrhQ28b7EWRt8x/yoQyWYv2zgY6q9DOxOYs kHDbpRBC+wVDzQAFcATN/5zamyOX6Iltl6+MM3YQ1Ogd8c7sHlCtGC5NDUhj+w== 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 4bpX3K1BxgzqwM; Fri, 25 Jul 2025 15:34:05 +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 56PFY5jr085342; Fri, 25 Jul 2025 15:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PFY5PS085339; Fri, 25 Jul 2025 15:34:05 GMT (envelope-from git) Date: Fri, 25 Jul 2025 15:34:05 GMT Message-Id: <202507251534.56PFY5PS085339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 00294d7b0a2e - main - bsdinstall: Guard against invalid branch/revision 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: 00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 commit 00294d7b0a2e3ae3e870333ef7c8ecbc9fa26da3 Author: Ed Maste AuthorDate: 2025-07-25 14:56:22 +0000 Commit: Ed Maste CommitDate: 2025-07-25 15:33:56 +0000 bsdinstall: Guard against invalid branch/revision I somehow ended up with a tree where make -V BRANCH and make -V REVISION were broken, resulting in a FreeBSD-base.conf with a broken repo URL. Check for BRANCH == RELEASE explicitly and emit a warning if BRANCH does not match an expected case. Reviewed by: Isaac Freund Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51528 --- usr.sbin/bsdinstall/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 75db149b814b..e5bb3197fa05 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -22,8 +22,11 @@ REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE SUBURL= base_latest -.else +.elif ${BRANCH} == RELEASE SUBURL= base_release_${REVISION:C/[0-9]+\.//} +.else +.warning Invalid branch "${BRANCH}" +SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in