From nobody Fri Mar 07 00:34:03 2025 X-Original-To: dev-commits-src-branches@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 4Z86jS3vH8z5qMvn; Fri, 07 Mar 2025 00:34:04 +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 4Z86jS1K74z4Q5g; Fri, 07 Mar 2025 00:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741307644; 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=S80rGVKzm55blNaPPw1Lhm4uAeqO3/RP76SigrbEz5c=; b=T49vcGvjxUE2YahGqrKa84hYzqbw5bHRQCr+WaCLCOBish+Zt/bmpOIII/LguTJgO9RIsR 07bQvmISbWF0gEI9rSVbnIAeZM8bW8uQWbi/y55CpDvuMA4LAYIKvYCKrr+AOVEkxdx6Ap OG1U6POQwPtHI4EhDDXVzEQNBl7lqKq1k2wNH35WvIZ96q4MQ39zrzqdZiZTZP+aoHkppP EtK1i8min/brhQgjkyg21fpo7YanEp8wpPRIGG6/eb/5RpLThcYYitUcm/wDGAhIvXPe6u 65g1FvPX81e9NnxFAyTXOFu490p7o0FI4n3YgnestHHEfoRAoJ5uvgLBtKgdaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741307644; a=rsa-sha256; cv=none; b=tFlHSt+6LWWf5qIgh7JnXARFLuF2187t1yFNr4cGVAECP0Iktik7PRRN2Hosxsq2Xs9dBQ 9eFQBcag+i4BifHnjOp9iODU3i/LrAFZZn4py/M8FSeNVfVsl7vExoNTzvYyo5TUh2HrZt 3qSRCvSFCSj9E4mGNnK/W6/fwQVJv8ktj5mGbQj94JXiRKdvlWV2lNCtRciBp93zov6uh8 zfQgH5z92aHCIGsZ7Dpw9jP7mgBJGW4fjtfpGgEZlGTxSZGE4BYhNfT+XbyaVDWI53/Aw0 ShSfBlLOp2emhzq8TB3ANaDsIxMypsjh7gtzAMfnUCB7toPAJEHmAgQhJvFVbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741307644; 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=S80rGVKzm55blNaPPw1Lhm4uAeqO3/RP76SigrbEz5c=; b=y3XnzF65iPRqlRbbQVHWh5H5UYooaJCinldsyIK2OEhr353RdRzD2MQe27CcbZWLxzjvB2 d0uVSknQVi5ojmbAlMX+WemFQE/BjlOt3FJqt+feROmlzO0sZ3vmtZS9LWn9z7TK1chPXS G6dtnWk1ZsQHY9n1yHkx53vwK/Asvs8n+ovUsSxZdF210UQZoQiXUHzQgVdg5J3HL/vh9L M94gbRoZN2nvMWGAaykjMFCvymp9k3ab7kRekezTPWs8wbq0kaPsxMKuM169R9B2UwEM2f dG+la8OQCHPiwK7tTYXnadWjmPa61HWB21cnu4jbInWck9XLNQP4vIeCeQ7lig== 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 4Z86jR5XvGz1Cql; Fri, 07 Mar 2025 00:34:03 +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 5270Y3EC036862; Fri, 7 Mar 2025 00:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5270Y355036859; Fri, 7 Mar 2025 00:34:03 GMT (envelope-from git) Date: Fri, 7 Mar 2025 00:34:03 GMT Message-Id: <202503070034.5270Y355036859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2fae556f6a8b - stable/13 - var_run: Clean up style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2fae556f6a8b10bdef22eba0d83b0880e3669496 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2fae556f6a8b10bdef22eba0d83b0880e3669496 commit 2fae556f6a8b10bdef22eba0d83b0880e3669496 Author: Cy Schubert AuthorDate: 2024-11-26 15:16:22 +0000 Commit: Cy Schubert CommitDate: 2025-03-05 04:46:14 +0000 var_run: Clean up style Clean up style and make more consistent. Replace test with if-then-else to make the script more legible. Replace the call to dirname with the shell %/* operator avoiding a fork & exec. Reorder the test for $var_run_autosave before the test for /var/run on tmpfs. This avoids gratuitously scanning the mount table for a tmpfs /var/run. Initial concept by and in discussion with: Harry Schmalzbauer No functional change intended. MFC after: 2 weeks Differnential revision: https://reviews.freebsd.org/D47773 (cherry picked from commit ed9712f8943573136fa92a0e61c8e7c10952eeb0) --- libexec/rc/rc.d/var_run | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/var_run b/libexec/rc/rc.d/var_run index eb9cdbd59305..71f84d23cb3d 100755 --- a/libexec/rc/rc.d/var_run +++ b/libexec/rc/rc.d/var_run @@ -23,26 +23,30 @@ load_rc_config $name : ${var_run_autosave:="YES"} _var_run_load() { - test -f ${var_run_mtree} && - mtree -U -i -q -f ${var_run_mtree} -p /var/run > /dev/null + if [ -f "${var_run_mtree}" ] ; then + mtree -U -i -q -f "${var_run_mtree}" -p /var/run > /dev/null + fi } _var_run_save() { - if [ ! -d $(dirname ${var_run_mtree}) ]; then - mkdir -p $(dirname ${var_run_mtree}) + if ! [ -d "${var_run_mtree%/*}" ]; then + mkdir -p "${var_run_mtree%/*}" fi - mtree -dcbj -p /var/run > ${var_run_mtree} + mtree -dcbj -p /var/run > "${var_run_mtree}" } _var_run_start() { - df -ttmpfs /var/run > /dev/null 2>&1 && + if df -ttmpfs /var/run > /dev/null 2>&1; then _var_run_load + fi } _var_run_stop() { - df -ttmpfs /var/run > /dev/null 2>&1 && - checkyesno var_run_autosave && + if checkyesno var_run_autosave; then + if df -ttmpfs /var/run > /dev/null 2>&1; then _var_run_save + fi + fi } run_rc_command "$1"