From nobody Sun Jun 7 21:19:41 2026 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 4gYSjp0xdNz6g6y7 for ; Sun, 07 Jun 2026 21:19:42 +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 4gYSjn5crGz3bDj for ; Sun, 07 Jun 2026 21:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780867181; 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=eryQ1Ced+rBIghGY0XpBWziIwIWe8EDmcR8Y6Z29yvk=; b=pLm5D0dv6TpTlvDCVikDkey1n5V4XZOHRCx5AZdD/DBOMiTXISaYqhwtaN+pK4qTjNqtao vwpWw4iL3uB/+xlEYveNh8NNrLu31X8dpg4KoYZMVWtxP5ZLBQ7SqJkrUHF+1GMwX6UDS3 /8Syjc9929aYAgBOybn/PbPx/XK5J8mymPpXywM0bb5ABUSIgPUwbzvO5thL60nterF04P 0ficBFWj8zmns4uHhy6qYwBg4B7hRAViMrZ5Nj3mYOsTBCF5Ckj1y2DcM/9AzfC+WnETn3 OOK/ReXc7JrXJf7UAYF8Lsqv5Xmb/H90gU3cNJABERuCDW1ztveibMvukIlC6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780867181; a=rsa-sha256; cv=none; b=HhOax33kj5wlWGdgbMsRrUM/tKJcmUptsh3AXSLjhJ5NjwcLKwpY7g2wYLWeJ+pZNZkhdY LkVLLA1o2WhFJrwBgUA0AN+uj5kp8yTyVpISppmQOKwcakRDgq7pKrdPlheo8wbeIsBveZ VKA5ioAgEwDMNzMtSBBwPXSboRyQmvQ3dsDBADpGBzxVB2wL5o1R5lye/WUNd1qbmOKNBe ixeBSWlPkyFs5tJF/0fq40kYvzLMI3ORqt2/gVfo6rihOnHdEsvXRQnTCIRHwmveTxrZQk B3GAEzYvjcnj7Yik1+sXAu9xXireVMm7o4TTgaV91/JLgYYZKavAzNcCxuNO2Q== 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=1780867181; 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=eryQ1Ced+rBIghGY0XpBWziIwIWe8EDmcR8Y6Z29yvk=; b=lQkC99G6M4in7+oIbX1oP1pinc5V1pvC7L6jPySFSzHJ2zwNISg9prpZLsTL6UQE/9WBPd 1u5e3EtXE6uvCLk1BDjcC7oYTNRoDxqOQevCsV7QV7+J0ob5ZtNHZiACdemGmpzOdAH5Wm 93lLfSkQB7K6/1ekzG7/lmIH6IrUqwYmHmaGToPCwcizJILnvFWy4dipuDoOGm9rQIARhb QXAkAZ8uLeyl87rFur7u12Zw3aZTS/gPuT39YSFv6+tVcqgnf2wTsHvm5EVAhXJmKsm54K MTafcu4Cg5PRv51ed4kWJdtTImfGb5b1xS7endg4hxhW1isZGeqTmV/8JJwyjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYSjn5CK5z429 for ; Sun, 07 Jun 2026 21:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1875e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Jun 2026 21:19:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 91167d0b66e8 - stable/15 - rc: virtual_oss: Handle absent pidfile properly 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 91167d0b66e8a377a12b76d4cc6e4808000e1718 Auto-Submitted: auto-generated Date: Sun, 07 Jun 2026 21:19:41 +0000 Message-Id: <6a25e06d.1875e.93ef7bf@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=91167d0b66e8a377a12b76d4cc6e4808000e1718 commit 91167d0b66e8a377a12b76d4cc6e4808000e1718 Author: Christos Margiolis AuthorDate: 2026-05-21 16:53:27 +0000 Commit: Christos Margiolis CommitDate: 2026-06-07 21:19:34 +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 (cherry picked from commit b2677d002edbe9308b1f8cecd1a5fc515d2a5deb) --- 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 }