From nobody Mon Jan 12 20:19:45 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 4dqkJ225Jpz6P2h0 for ; Mon, 12 Jan 2026 20:19:46 +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 4dqkJ20TDhz3bqK for ; Mon, 12 Jan 2026 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768249186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b43ZjE7tZEWIpZTskTlyGYll02hy5pp7Y9n7hkuYViQ=; b=ux6Fyk5EEqSgKbNC6XelR6+3leibCvI2oYc5kouKa8jsL/PAg/3uqzblMs9zQNCtO8/dNG 7b+eJM5HghcWPm7yDy8V4FVOv8jNfFr7wL0pTFNk/mod4jyP2gh+4BVr1b7S3mQlXvjP2/ oWmz47uB1qLjsYR9uLm7CzMvwXeZvRTBBxsQULm1YWuPcqqnxoH/9fy+J7x6OGwFNhb8gc rPMjkEmZvgi9tybBP3t7/ptbGxG1qo26e0yK9dQ/83J4uOaK9n21cyaW9JpvuRjC07HcOz Hj5+QQ5lMYvnKMPk9cRbqhQ9J9myPv9e/TxndMRlJDw+QFMHlJoWDSFlphAJyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768249186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b43ZjE7tZEWIpZTskTlyGYll02hy5pp7Y9n7hkuYViQ=; b=ZpMaeiX/M0uACDCoUjliXVdLL2kRa9jnVvsKS3QIAn7D6PJcu39GoMrW0XKm/JcQuMKzl0 8ncVws3AQQDI4S7Cf+VKgOKrgUoXIhrjV2nUEAksQcsxaYSOKtL9pwZmgLf5zCGPbGOmxR PFc9DRGCH5lT6R1UxR5YntaZ2EOx9B25+utoILyy1DNhpB+ycSpzB5io4wKyLc/O44HOkC oyC5rs0iU0AgpTfUMjEGA3U1slZ6LJwrZHl0QXDqenSfTRvqj0hEuIa7kUIuz9r0AH7YUL 5zCPvqL74cBOfEuivbGstMNL9sbXm+mykQFl6wvZvGDyFm3mzx+DssjDh47t2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768249186; a=rsa-sha256; cv=none; b=OpEjNRaIlp7u9zfAAVgBAxQYziuYyP1wOeuKjIcj6ZbvczVfcJP7S6yAvZ+LNucAtxh4cR fGY1iVvvqG0OHWHyfwUwVr7itfmzXoQ8zvDDOC+XFOntbO1/v3apkptn90bwQtibXt3vDm ER0+/TD6lb0WEzQTJIz6i7FpfYG4ldNmluf06JTp1nSTStJZ4J+W0MKUSZ+C7DMdpIgcK1 BUJr2shsG8bmYJ7nQmzlxjI7iA4bGjSxCHVh7BC8yqTiONMrbaNe5AXTA4vmq+X1eCmgpW QxoAr+4ktApqj/6aeDyCVkQ+XYogujE1VoURsfWTjADZSRlzCP5qjJv0Wheytg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dqkJ172H4zj3r for ; Mon, 12 Jan 2026 20:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 92c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 20:19:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: NVSRahul From: Warner Losh Subject: git: ced7f29dece3 - main - rc: Add os-release URL rc.conf variables 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ced7f29dece3d27785c5037b8aa36e5d48d34b3d Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 20:19:45 +0000 Message-Id: <69655761.92c2.2b84099e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ced7f29dece3d27785c5037b8aa36e5d48d34b3d commit ced7f29dece3d27785c5037b8aa36e5d48d34b3d Author: NVSRahul AuthorDate: 2026-01-12 01:42:20 +0000 Commit: Warner Losh CommitDate: 2026-01-12 19:43:36 +0000 rc: Add os-release URL rc.conf variables Add rc.conf defaults for the os-release URL settings introduced in the os-release rc.d script. This makes it easier for downstream integrators and appliances to override the URLs via rc.conf instead of patching the script. The following variables are added to libexec/rc/rc.conf: - osrelease_home_url - osrelease_documentation_url - osrelease_support_url - osrelease_bug_report_url These correspond to HOME_URL, DOCUMENTATION_URL, SUPPORT_URL, and BUG_REPORT_URL in the generated os-release file. Signed-off-by: NVSRahul Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1961 --- libexec/rc/rc.conf | 4 ++++ libexec/rc/rc.d/os-release | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index e8f146807f33..2ecaf642d574 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -705,6 +705,10 @@ harvest_mask="4607" # Entropy device harvests all but the very invasive sources. osrelease_enable="YES" # Update /var/run/os-release on boot (or NO). osrelease_file="/var/run/os-release" # File to update for os-release. osrelease_perms="444" # Default permission for os-release file. +osrelease_home_url="https://FreeBSD.org" # HOME_URL in /var/run/os-release. +osrelease_documentation_url="https://docs.FreeBSD.org" # DOCUMENTATION_URL in /var/run/os-release. +osrelease_support_url="https://www.FreeBSD.org/support" # SUPPORT_URL in /var/run/os-release. +osrelease_bug_report_url="https://bugs.FreeBSD.org" # BUG_REPORT_URL in /var/run/os-release. dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot dmesg_umask="022" # Default umask for /var/run/dmesg.boot file. watchdogd_enable="NO" # Start the software watchdog daemon diff --git a/libexec/rc/rc.d/os-release b/libexec/rc/rc.d/os-release index adaa8547913c..43af666614ac 100755 --- a/libexec/rc/rc.d/os-release +++ b/libexec/rc/rc.d/os-release @@ -8,17 +8,20 @@ . /etc/rc.subr +name="osrelease" +desc="os-release update" +rcvar="osrelease_enable" +start_cmd="osrelease_start" +stop_cmd=":" + +load_rc_config $name + : ${osrelease_file:=/var/run/os-release} : ${osrelease_perms:=444} : ${osrelease_home_url:="https://www.FreeBSD.org"} : ${osrelease_documentation_url:="https://docs.FreeBSD.org"} : ${osrelease_support_url:="https://www.FreeBSD.org/support"} : ${osrelease_bug_report_url:="https://bugs.FreeBSD.org"} -name="osrelease" -desc="Update ${osrelease_file}" -rcvar="osrelease_enable" -start_cmd="osrelease_start" -stop_cmd=":" osrelease_start() { @@ -46,8 +49,6 @@ __EOF__ startmsg 'done.' } -load_rc_config $name - # doesn't make sense to run in a svcj: config setting osrelease_svcj="NO"