From nobody Sat Aug 23 00:11:21 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 4c7yCG3H95z65RbX; Sat, 23 Aug 2025 00:11:22 +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 4c7yCG0t62z3ZdN; Sat, 23 Aug 2025 00:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; 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=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=HPnOnTYJmkyXWVM/J5ZK5hn3i+eiqZy4u+1+vtlJjHYLJu/ZFtD5wo6MKXP5+3uotIj9FC m00jJ1Q83PQnmMUdssqbAeFECBYhS9dqfgYwI5cVpzXwiDVePI5NgO6arF5D669OwouDkr 8K0zz5P/9lh7TKxYTLme9je1U3ptbM48Q3l6b5J1X/BHsf1XG/SUE7/jmLKW0kovTLDOXj 2UZL7YMpV4D3bdUB0UMELGkrTg7hCsXtfsChoiwlkCSuBJ6Ex2Ms3TeS57ED1DDZ7gXdIY G/cTzrnJR27j48W4Eo6xYdBuzeIVmeiF73o2J1sIJ66LF8O86iTutYD5yqXiJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; 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=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=Ynf9yt22I/rI189BuY/oGseHklYOapBLbKl7NdCN1fmEviQQMd3G5Bb2F4GjuBa0tzcfbA WmiiCluuO2et1cTCgjeVqBiRkPg2b7PJ+hGSAWaEolqenD0BZTpe5e1xFiIIUfvepKXz+a Bie5Hkm7cHNDzB1bbsa89J/pvOnBM1l+pPHPCYN4qt8u8cxoFDCci1xxorCSIUS9aObvR/ Ss6EX+qp3gzDp5i6q3iBWVf//0TUtiak9FLupBCUNGPi1kYNFtUAEIdx+yBaDL/rcW5zpC nRHji4fqS8qW8zsHpOotinx6Crf1AhFvRyV73qJhQmxGA1e1xcVsJ/xPrjn1RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907882; a=rsa-sha256; cv=none; b=Cb/X8Ccyd7i1nWu8IDjVY9NIEcCc0hJqz/s7zFCzbRKojnAuKvVphj2VNnw9G49Uewl1G7 l2jvSQQ51MZ8n9hu7YcdnzQDluGm3MeWqAuIXzGRqWyeU/Y9rIiUHgktjh9emWzIMfgZqE QgsvxJAwSkw3Mu4mFl6wwzynTxQamTnFyuWjwyzz5TZXhDO38NhNS6M0N2wE4rCmvzoPED tNLC/Qn4GqTE5uK9XfFXplbv5KUy8VAprG5Tc007oVlXWB8I5mCSA8ZyXlyk72T7HdyZyK v1bR8xOMgAvnWwcPhiw0F89FKiswtSJ+Bmrl1F6PbXa+LeWpl2sn/ylZ2SD4iQ== 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 4c7yCG0LmXz17Ms; Sat, 23 Aug 2025 00:11:22 +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 57N0BL2G098288; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BLh5098274; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:21 GMT Message-Id: <202508230011.57N0BLh5098274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1eb29a37f26b - stable/14 - rc.conf: Use user.localbase to determine _localbase 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1eb29a37f26b1a3671f38037dd61975e1b1105cf Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb29a37f26b1a3671f38037dd61975e1b1105cf commit 1eb29a37f26b1a3671f38037dd61975e1b1105cf Author: Lexi Winter AuthorDate: 2025-08-10 12:24:03 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:47:24 +0000 rc.conf: Use user.localbase to determine _localbase When running an rc.d script outside of boot, ${_localbase} isn't set, and rc.conf hardcodes the default value to /usr/local. Instead, try to get the localbase from the user.localbase sysctl, and only fall back to /usr/local if we can't for some reason. This fixes e.g. /etc/rc.d/ldconfig when localbase has a non-default value. Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D51852 (cherry picked from commit 5467020a540d92a39dcabc149a264f3c0d0c084c) --- libexec/rc/rc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index b3c54c3cb0f0..a8a8ae01b488 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -21,6 +21,7 @@ ############################################################## # Set default value of _localbase if not previously set +: ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} # rc_debug can't be set here without interferring with rc.subr's setting it