From nobody Wed Feb 19 02:45:32 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 4YyLNX3F5Lz5nb2f; Wed, 19 Feb 2025 02:45:32 +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 4YyLNX2YnKz49rT; Wed, 19 Feb 2025 02:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739933132; 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=gtSRsHsrzs3tcOCd8d+4EAGNryF5QtI+ohxF0OADrbc=; b=BQNubrc0F8+/GAMVMVoIn9dax2KMVALzKgoC97NYrxZIBf2AsUeCmGp8YPQZTv5J/FqPkW t3aZqMhFF8buL9nmBte6E0l4WNzzPSR2eGaqjviOKG9R9zMyYJ9Iyz+AqtHffeeidtr3qw ue5+D/VWgRX+aCaDFuXTlfLHt2dej/vbj6M9beQVq6B3IAAjKFxeCQ9aQWyXn1Fjn19Nvc O1A136SlBdrdm4C8IcSEGpQxQa9Np5Vj9O0MYkJjhPUXL5VLoR8DKfMhmvfa+eRVPPvH7j SrJe+xp3CMxkLgILRsX+xd0H2juM+fKWNX3re+EiFb+ji3l6wpPkqCI6G4NoRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739933132; a=rsa-sha256; cv=none; b=HvD8Yz6Mlcco1dEhRi1JBcWZet0/NH9fwS/fCrKag8b7yncqS0plydATnHgh+AOQo7T3cf 36iiP3xGT3ZP4BzlqRh+jDcg4o3FSWX8LambgCXBbDVRnWaMC6tXln6zkEM1jXpCl3Y5JN VcrSC3UIIotSwI+Nw2NuItObGAMvH10oVhDwW6gQDYmMcPsJ5pLTkGBqh6WsTh8PRWyF6c jeIaFpn5V31vMnGt5W3RZ/AO35++LZIH/vHNLqBcRRkanMaBYUIErl73DyVMdS6KCKXhgn SkPcha5bJu9AwtxB7wdTMy3aZwDy1shSrTvN/ovjR2/aFUmLHUFqGsNPyDE2Lw== 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=1739933132; 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=gtSRsHsrzs3tcOCd8d+4EAGNryF5QtI+ohxF0OADrbc=; b=n/S5iLrLJA4vz7pohW7dl68OCKsqbJlU1e/6Pp2J0wIvCgqT0ZuxMaM37NsE9kUAKnO3Lc QYeo8SF/aqJg7za5tIiSXhOTjsBrDXL2LoNKtQX/Q0mxxiRsw+cty3oyoBu4Y4J0Z3Jw37 J9NOPLSL+u7+i47shZLq4dHzTwWJI5OpvmepOD3bpJpMEynucdEjpCDY2gUyi2Sdnj7+cO GccHUlIiywCx8ybukXYYdPRl7mrOw+KjzPgfAaO60iRzyEoWza3efSAf3yslJAmXM8BWk2 hqCWeDQ3yJtiiXyL6vgxvpTlp4U6UBGBDjheGJ4CP9EHqXzgaO1pvQeyY80KQQ== 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 4YyLNX23h6znL5; Wed, 19 Feb 2025 02:45:32 +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 51J2jWiK030609; Wed, 19 Feb 2025 02:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J2jW9q030606; Wed, 19 Feb 2025 02:45:32 GMT (envelope-from git) Date: Wed, 19 Feb 2025 02:45:32 GMT Message-Id: <202502190245.51J2jW9q030606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ed9712f89435 - main - var_run: Clean up style 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed9712f8943573136fa92a0e61c8e7c10952eeb0 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ed9712f8943573136fa92a0e61c8e7c10952eeb0 commit ed9712f8943573136fa92a0e61c8e7c10952eeb0 Author: Cy Schubert AuthorDate: 2024-11-26 15:16:22 +0000 Commit: Cy Schubert CommitDate: 2025-02-19 02:42:34 +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 --- 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 f76a06ab9f5a..9a3732f593b6 100755 --- a/libexec/rc/rc.d/var_run +++ b/libexec/rc/rc.d/var_run @@ -21,26 +21,30 @@ load_rc_config $name var_run_svcj="NO" _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"