From nobody Sun Jun 1 09:22:25 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 4b9BMR2wm1z5xP1K; Sun, 01 Jun 2025 09:22:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMQ19pcz3cGg; Sun, 01 Jun 2025 09:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769746; 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=MIMA6McTTk3I/dOIqRBt/quUAmgA9fnsR8NiDLvsaq8=; b=VEhIppTTRDfFdpufD9s1qEPtWNbcD3zGQCKUrqaCaqT35FTeSwxHC/Pv4dS89lysC3/mFO sPyjeRSRdzQfxqB9qonFMoXt1tpCTHJcQPYRdGnJyyiJIqQOsiNyRENN0PUWIoulkmGAxX xeW6XlloRgyuVRV48NcSiusepqWqru7RZGNfNhpAal04g5a6wwCTlqN7I/nFyknJHYZ8XZ P9VBkmBsaT00iVK5DRWpZzPvbBAjINAJCvQpzMPARZLh8k49kXd/C89V5kOIV0sayPzTqF swuNux2DpVjoON5T1gBw9352bjE/2QTMkevzLwTFj8lJZCxzCA2E90PGbSyFAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769746; 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=MIMA6McTTk3I/dOIqRBt/quUAmgA9fnsR8NiDLvsaq8=; b=Z2IkWddJyj028KnNwiQGOeTTjqxbIa7c3DiYHXstParzTEza4+MZe5ON30LzosQbDFYHVv nr5Gmfy5kWS3zSPPc6tTSEWEYNI7IXUE2DlQ/myHVmYWXQ2PUeOa72mfxgezSzBWncmFAI 8FkbKNb0zds27GX9PoIpdYCVwa1OhbiVu0qq2S7VAajULVVuvi8Nca1os0iFfUgsoQcRMq HUfXB4wz76qyqMWWpm9eZdsDQwULxPf1b7bcfYLLDsn/OQKhwbDWT5ppQQ1XZOUWOtu5tR meoH5fRjoHj1xZVmK6ZEu1EeNRXUjRVgwSY3asenYXCRX4r7rCGll3vZFOKe/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769746; a=rsa-sha256; cv=none; b=EMhD1k9Xdao5FecWHEjDBs/GfXqpU3n2KylicNzGEQsCLWwPyciIk0zoERAWdwrtQSohBV rVS2GjMyomiggBSs7yqhIGuWE7tgjT85wuzxgGotfhaMRZISIBEqtNj5B+Mqp6IdJwkDJw ftlfS5/3YbnTxOBAGxIxegx/UJGYLqgHIoNWn5Xn8yYrC74IJOE8Sac4pLxEunm4XNE12m Q1MZJIXkUkJ25q3CimRPXxg7bk6lIKn5vObmXY8wxzuH/ZOhCxN87BWGe1GlPJ9NMKV/Pj crdV/p8RJ58upAN0z/SaJjL/FOpFjHAq5whM+7sxFSBbvR1nVIgp5pZQwxFLdw== 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 4b9BMQ0TsPz1hj; Sun, 01 Jun 2025 09:22:26 +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 5519MPBd049259; Sun, 1 Jun 2025 09:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MP8u049256; Sun, 1 Jun 2025 09:22:25 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:25 GMT Message-Id: <202506010922.5519MP8u049256@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: 7d88b0e3dbe4 - stable/14 - rc.subr: remove the dependency on bsdconfig 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: 7d88b0e3dbe46da939bd9f95164b2d332e9fd53d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7d88b0e3dbe46da939bd9f95164b2d332e9fd53d commit 7d88b0e3dbe46da939bd9f95164b2d332e9fd53d Author: Lexi Winter AuthorDate: 2025-05-14 14:33:36 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:52 +0000 rc.subr: remove the dependency on bsdconfig rc.subr uses sysrc(8) for the 'enable' and 'disable' commands, which means the entire rc(8) stack depends on bsdconfig. Instead, provide a minimal amount of rc.conf-editing functionality in rc.subr and use it to implement these commands. Reviewed by: des, bapt Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50325 (cherry picked from commit f6328f052518d56c01f10e14cd9ef1f2675c01a4) --- libexec/rc/rc.subr | 102 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 16 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 5140f2a1addc..c6bc6d1a1395 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -53,6 +53,9 @@ PS="/bin/ps -ww" JID=0 CPUSET="/bin/cpuset" +# Cache the services that we loaded with load_rc_config. +_loaded_services="" + # rc_service provides the path to the service script that we are executing. # This is not being set here in an execution context, necessarily, so it's # really just a reasonable guess, and it will get overwritten later if @@ -1102,28 +1105,17 @@ run_rc_command() ;; enable) - _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=YES") && - echo "$name enabled in ${_out%%:*}" + _out=$(write_rcvar "$rcvar" "YES") && + echo "$name enabled in $_out" ;; disable) - _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=NO") && - echo "$name disabled in ${_out%%:*}" + _out=$(write_rcvar "$rcvar" "NO") && + echo "$name disabled in $_out" ;; delete) - _files= - for _file in $(/usr/sbin/sysrc -lEs "$name"); do - _out=$(/usr/sbin/sysrc -Fif $_file "$rcvar") && _files="$_files $_file" - done - /usr/sbin/sysrc -x "$rcvar" && echo "$rcvar deleted in ${_files# }" - # delete file in rc.conf.d if desired and empty. - checkyesno service_delete_empty || _files= - for _file in $_files; do - [ "$_file" = "${_file#*/rc.conf.d/}" ] && continue - [ $(/usr/bin/stat -f%z $_file) -gt 0 ] && continue - /bin/rm "$_file" && echo "Empty file $_file removed" - done + delete_rcvar "$rcvar" ;; status) @@ -1540,6 +1532,7 @@ load_rc_config() # If a service name was specified, attempt to load # service-specific configuration if [ -n "$_name" ] ; then + _loaded_services="${_loaded_services} ${_name}" for _d in /etc ${local_startup}; do _d=${_d%/rc.d} if [ -f ${_d}/rc.conf.d/"$_name" ]; then @@ -2293,6 +2286,83 @@ _echoonce() esac } +# _find_rcvar var +# Find the rc.conf file (other than /etc/defaults/rc.conf) that sets $var. +_find_rcvar() +{ + local _var _dir _files + + [ -n "$1" ] || return 1 + _var="$1"; shift + + _files="/etc/rc.conf" + for _dir in /etc ${local_startup}; do + for _name in $_loaded_services; do + _files="${_dir%/rc.d}/rc.conf.d/${_name} ${_files}" + done + done + + /usr/bin/grep 2>/dev/null -rl "^${_var}=" $_files | /usr/bin/head -1 +} + +# write_rcvar var value +# Add or replace the rc var $var with the value $value. +# Look for a current setting of $var in /etc/rc.conf or /etc/rc.conf.d/$name, +# and if found, modify it there; otherwise, append to /etc/rc.conf. +write_rcvar() +{ + local _var _value _file _dir + + [ -n "$1" ] || return 1 + _var="$1"; shift + [ -n "$1" ] || return 1 + _value="$1"; shift + + _file="$(_find_rcvar "$_var")" + if [ -n "$_file" ]; then + local _=$'\01' + /usr/bin/sed -i '' "s${_}^${_var}=.*${_}${_var}=\"$_value\"${_}" "$_file" + echo $_file + return + fi + + for _dir in /etc ${local_startup}; do + _file="${_dir%/rc.d}/rc.conf.d/${name}" + if [ -f "$_file" ]; then + echo "${_var}=\"${_value}\"" >>"$_file" + echo "$_file" + return + fi + done + + echo "${_var}=\"${_value}\"" >>/etc/rc.conf + echo "/etc/rc.conf" +} + +# delete_rcvar var +# Remove the rc var $var. +# Look for a current setting of $var in /etc/rc.conf or /etc/rc.conf.d/$name, +# and if found, remove it. If service_delete_empty is enabled, and the +# resulting file is empty, also delete the file. +delete_rcvar() +{ + local _var _files + + [ -n "$1" ] || return 1 + _var="$1"; shift + + _file="$(_find_rcvar "$_var")" + if [ -n "$_file" ]; then + /usr/bin/sed -i '' "/^${_var}=/d" "$_file" + echo "$_var deleted in $_file" + + if checkyesno service_delete_empty && [ ! -s "$_file" ]; then + /bin/rm -f "$_file" + echo "Empty file $_file removed" + fi + fi +} + # If the loader env variable rc.debug is set, turn on debugging. rc.conf will # still override this, but /etc/defaults/rc.conf can't unconditionally set this # since it would undo what we've done here.