From nobody Sun Aug 10 15:37:13 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 4c0MMZ000lz64B4M; Sun, 10 Aug 2025 15:37:13 +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 4c0MMY6S3kz3f5S; Sun, 10 Aug 2025 15:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840233; 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=ci/Jmg4EdzOb2WO69QHNnS900GKFiLXkkcohSNhi+fY=; b=ujL+w1AyuKY1dVsvEcME8RDzdvk7T+nMB+e6DskgWni0rOXqsFjZu8pJofIo/Beiz8v5RO VI3c1x2UkKvwSk1tENRRkm6uSlxAxjSz8DXcgYEKTc/sJomhxnIAS8GEejI/KNdwRf+wy0 RwsTSi2jCvUM/yNedGB7k3DnJQQYnMsCOP45aLvbtABjTzH9yKyP3MLQL/O3dIa6HmuGsy hPYilFAK/3nWOQN5KHGjtikQzE492aOcuYQYEuLsKUyvPOYZNIJsVC6lKyLA66CXkmacx0 AD6CEXOTei8j15f0HVcC59wkzCGzbMwqzJv1ABoWFSa1Pgm3gwloPCc73Ndwqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840233; 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=ci/Jmg4EdzOb2WO69QHNnS900GKFiLXkkcohSNhi+fY=; b=F+cFWoHeaIm6kBDSohYvnqMjlY1K4uJY0mMJDkn0Yoto928CDuOVzOknjBbQ0Kgo5rFCBC Jp524kmQUfs+ijA7rGNfNDM62NxBJ81aD/XrCi4uPGJUEJW6McheaLJ9PNCDqzTPv/nOBI ZmEGPNZAW9Kd0QzBQ99nNr4UoqJ459MWjHTpHf8a1LjMl0oPU35gAGZRaXMvVUh7E/RIB7 EZVjwBPjYAPHiNlLnShEnPY8ZEuie2xQidS4VorUIfxfOoC4w1foOrUNbAmitEdQvIb5yw PyxY0IpTSeskFbz/SWSqZaz+8YsqKsBWhOQUBR3us2914l/p5lbTBiw5dL5exQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754840233; a=rsa-sha256; cv=none; b=Cv83nWW4vzIxoT4RFsCB2WSCxktWlZ6AfSDV6AiQpEJLWnme5qhwNaPdtc0Di2X0W3E5qb rOhmwpe2Tw5r2UKHCbcxseH2tYbTcyEU92iMKSN61rI080ln8MLxDxxFPCNJJyj5N3vuhw ZLiSAHvs1z89QuyLKjKJBHYBCiJwlibiTUMehl7C4sSfa+6JYnUJf+xWNbBIYHr6G0+4v4 3PfVJY3CfylkeGNjdDCQEJHwT11a6D6wMgtycWgwngreEabjUV89RjPsmv1pE3ilfLMZAS 7w4aGBJUS2ILhSQEoO3kc2kUgThKzJihVeOSoOneMRMRwVuCcTrUYzVDjFfjAQ== 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 4c0MMY63W9z1BSv; Sun, 10 Aug 2025 15:37:13 +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 57AFbD40067116; Sun, 10 Aug 2025 15:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57AFbD3a067114; Sun, 10 Aug 2025 15:37:13 GMT (envelope-from git) Date: Sun, 10 Aug 2025 15:37:13 GMT Message-Id: <202508101537.57AFbD3a067114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 5467020a540d - main - rc.conf: Use user.localbase to determine _localbase 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5467020a540d92a39dcabc149a264f3c0d0c084c Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5467020a540d92a39dcabc149a264f3c0d0c084c commit 5467020a540d92a39dcabc149a264f3c0d0c084c Author: Lexi Winter AuthorDate: 2025-08-10 12:24:03 +0000 Commit: Lexi Winter CommitDate: 2025-08-10 15:36:39 +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 --- libexec/rc/rc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index d502361eca37..bfa46bd343a6 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