From nobody Thu May 28 14:07:02 2026 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 4gR7bC0jq0z6fnKY for ; Thu, 28 May 2026 14:07:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gR7bB48snz3cnq for ; Thu, 28 May 2026 14:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779977222; 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=hZKFNX4380R4srrXcDVB3gQw0TRnW7Ep2Dh29pfJT6A=; b=FIdEsfMKjGctelRwogJqAX2zJAH5Ak/VjZFD0T+UlbwNBvkk98VrEMhCD4Csef4yv710qZ kLCx8ZhaKC244i9HNNgjm7PBt6qsTKvPo9o1qz/HVzV9XMiCGyDGCXO36+0mQI+5qQ+WaG 36MIqelAIYlXpGaID7COq2oz0l5t9VtMUcrNXCIE/iQ0GSdJpM7LAxKJ0+WVNyjYyxOY1V 3ZekjMFpDNAdHlKpMUeahNeph0UokNXbxMs3DdR2k0YGeebB3BnduRgEdfXaXEYPMconO/ lSVn3QosAkq0BU/yF+S3oNdswC7m0IxNkWG4kUetZSGWFd8UUZLLhle2u78JIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779977222; a=rsa-sha256; cv=none; b=XKWgRg6XaBe2nCU5CVvRs9t8taF6QsT/WFmgaw36GBVmU02kKx9mWHwi6J8q7wjHBZMTR9 +xOhJmKbazzTFRsy15Q627iK1tZn6bZquOtJHRu2LhT9/LbCE/zf7n7cstZuXKm3VvABK8 aCpmRUEXxpNBkx30CaYcWdRD4KWDYBz6nscNkP8nZg/FrHllrYf9egXQBlMd4NiOAJYVej Iwt2ZG/XwNP+zW55MrHXnMLJ227yotf0QDQkpbbY0vGY9X+y/tiKLzTWED/DMlA5XL10tv gECnTrB/8olAWtWaD4YI4f7vyORn/xNDqVyPrsr16HgIOqUZZn5xfH89F+/i3w== 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=1779977222; 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=hZKFNX4380R4srrXcDVB3gQw0TRnW7Ep2Dh29pfJT6A=; b=AtS3IauLgGzGo9C6hSW/K5LpYh9FAFAIjg2YJngqdFTutSxg26nvw+3xqhXaqkuMej98pU 6j5zUGvWo5RRXtP6NzapWsbHwtu58QERcHs1rEHOdLN2rXBckaei9YPKRwkwE1rditArzO 64DyyG6/Clw371kPiGyMsx6al7OFWMhhz4YqPXsjgqRs7JogOH9Ft7LPMGclhp+MVhnWX1 q7MXqK0zlST5Zo1sHytRTZ9DMghhHwNw8Q20ansgRAkgYKcLxm62QGyEVLm+3tyhVovfsR Y3qomTLI4jTDwo33Bzy8nZUoYzfnWTYIbLKXWSquTCYSstUWG8z1IMTGvFr43A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR7bB3T3fzqBw for ; Thu, 28 May 2026 14:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 14:07:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b2677d002edb - main - rc: virtual_oss: Handle absent pidfile properly 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2677d002edbe9308b1f8cecd1a5fc515d2a5deb Auto-Submitted: auto-generated Date: Thu, 28 May 2026 14:07:02 +0000 Message-Id: <6a184c06.1e964.3e910c9e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b2677d002edbe9308b1f8cecd1a5fc515d2a5deb commit b2677d002edbe9308b1f8cecd1a5fc515d2a5deb Author: Christos Margiolis AuthorDate: 2026-05-21 16:53:27 +0000 Commit: Christos Margiolis CommitDate: 2026-05-28 14:06:06 +0000 rc: virtual_oss: Handle absent pidfile properly Instead of throwing errors from the programs that use it, print a warning if the file does not exist. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: 0mp, jrm Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/33 --- libexec/rc/rc.d/virtual_oss | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index dd3bbe41c094..9861545b8bfc 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -76,12 +76,17 @@ stop_instance() if [ -z "${instance_args}" ]; then warn "no such config: ${config}" else - pid="$(cat "${pidpath}/${config}.pid")" - startmsg -n "Stopping virtual_oss config: ${config}: " - kill "${pid}" - pwait "${pid}" - rm -f "${pidpath}/${config}.pid" - startmsg "done" + pidfile="${pidpath}/${config}.pid" + if [ ! -f "${pidfile}" ]; then + warn "not running: ${config}" + else + pid="$(cat "${pidfile}")" + startmsg -n "Stopping virtual_oss config: ${config}: " + kill "${pid}" + pwait "${pid}" + rm -f "${pidfile}" + startmsg "done" + fi fi }