From nobody Fri Mar 7 00:33:54 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 4Z86jH29LSz5qMvj; Fri, 07 Mar 2025 00:33:55 +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 4Z86jG51yrz4Pr1; Fri, 07 Mar 2025 00:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741307634; 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=VArXX722IsPgzav/1JxiNMep1P7k4OuDYU2+EfvAMS0=; b=o+5EPzb4AbifuIwfkxGRZ+b3+B2Wr2FfXS2nsOFEwxmUSotUfaDsbopfs+5zjXpqZbrxgk cGYfjnhxUe12J9ZzGoMmpefklkVyViwTebCcqh7N+UUNNXgbzAtTyxu/l/mTsAU6Oo6KDt Fn4etLSyF0rqF8lD2iuIRQi1B/vv4Dc+6loYu2YLzZU5EUAsMiCyBfgq9fINxcbLeLaAta lcLDo8FYgk3UZ9e0tx6E1mCKcvNu38hHl7qmSo/H7kmh4oJhaJe0yQ4DFNp3Jhy6UuK9eu IaWKwKCMhw5Bfb+CjHLVHwG2fA4KMCkHU/nOBw2MG2wbCzu2vOM1GlQ+1CfBjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741307634; a=rsa-sha256; cv=none; b=MCf6QL2U5De3Hbw9eE3d57s1B8G6EZS4EQCJoB2lNHMCCmuYeWYErPIRMMb/FE/1HSbUhw Cpcx6kxgDSGtoy9ITBigRfCfNhzdlXsl9cS9Ny+p6c5z6bvq12B0+iMli3Z7FtSjiCbSso GVBpZce8ANhY0ts0AVXcMzMNUDhNj5z0npITsAI0VSPVW9X/21jv4mlBrIdCEAo9UVjHEZ 0hMtp9MESpMrdhk7DCNYTfHgn90Rl5CPFRzSw5Ajj3OfvOKj5FZ9anOAThfINjkuvXe/T3 XcBlpWjRM8DBVrBuCnJgyxz+4Y2sYVfFaGkDElRrt5WdK2rpamjz24Nl9CEkqQ== 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=1741307634; 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=VArXX722IsPgzav/1JxiNMep1P7k4OuDYU2+EfvAMS0=; b=kyKiFlk6EM7vWHksPmYMv9MezCMbBUYHV1aNvkF64254kEwT1Q9Ln/cLtg9qXx8Q55lV4C RSCBdciFbu3a38yj2bRFnDYFhNLFA5b2vYXdIcSIYGSXqgWsTBL+tlQbwPYhZTM08pvCWq K4vskKE2eYBSdPvBn0/uIeINW4asFV1FfPiTR5Uc9zUCs3Yy26H5dWNW4MIh7GtS8dW+7F vNBW0nGuH60prhePKKx4Xq7tkV1K1bmiB7uh924kqA3xiQC9/rxAP7TN987hRPRQNM//Vq +fcnRkA26bEIQni4aP31YiIt9KIwptPb1KDdLilIIJzcMnX18a8UtZoD80TIWA== 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 4Z86jG4Mt6z1CVt; Fri, 07 Mar 2025 00:33:54 +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 5270XsNj036650; Fri, 7 Mar 2025 00:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5270XsvL036647; Fri, 7 Mar 2025 00:33:54 GMT (envelope-from git) Date: Fri, 7 Mar 2025 00:33:54 GMT Message-Id: <202503070033.5270XsvL036647@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: 23ad1f4bb737 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 23ad1f4bb73778c1e01600be76a4a85edcc6c330 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=23ad1f4bb73778c1e01600be76a4a85edcc6c330 commit 23ad1f4bb73778c1e01600be76a4a85edcc6c330 Author: Cy Schubert AuthorDate: 2024-11-26 15:16:22 +0000 Commit: Cy Schubert CommitDate: 2025-03-07 00:32:53 +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. 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 9f0f7fcf37fd..6d54aedd7421 100755 --- a/libexec/rc/rc.d/var_run +++ b/libexec/rc/rc.d/var_run @@ -18,26 +18,30 @@ stop_cmd="_var_run_stop" load_rc_config $name _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"