From nobody Sun Jun 7 21:19:40 2026 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 4gYSjn0gNVz6g73K for ; Sun, 07 Jun 2026 21:19:41 +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 4gYSjm52bKz3b8k for ; Sun, 07 Jun 2026 21:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780867180; 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=M0zAWcaKqR5x1nIgFVjqgzqkViLt5wAcpL5fADJq4Ck=; b=lqg2gutf3rDajuM64LLnRKrRTI9rYmXKHror+b9VbYNaAmf5XvVKJET+Qlpd75wLKTSnHK ZNtUfzUvoDHNbv/RU+aZUPW8y/zpfiDE0yPydrJ3U8ycs4lHNAGukAuc+Nwc0Q59PC/gyY NWEqaNtXahP0yX/2wl63uURqIdJ8ZQ1WJDueaAV4rRN693uTHVq3ZSDN4YQqz2Ip4CSbNR voTU3Vfu9T7t0JpjaNrEW2gUOd46qBYvUtfLsA9KnyGyocVu/7p9IGBrKj8yg8rpiHOkc0 XE6wcLBhvNFeGeBLWJZ1HL2aJMFyd/Cneskyg0iUYWdzdIFiXOzBI5e66JZAYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780867180; a=rsa-sha256; cv=none; b=idjgkABwrlmxxkD/IOZhEeR34V9g4Vv3f+S+kRoH8iSd4kmVanLL1WxJZUq3svc/OOWGmb rfaxcXtX4lVZdQBGq+8I4Cb6/RfUoRIcLsEX0HhPW9nOVSsKc2h03EhnzpOY1gCoC618CV HWTvN6PzU1TO3YfwB+a97v4k/uyolEWHzn8f15rIH15APZt5nNTA7LDwAGIxUUEWzlFmsO oHtzxj71iRrPbxCawz/76sp+L+yynkc91Fqqs+q76N9g27L5vyKMdxJbRtnU0ZdVZZjpic X+hnpS37vqy3+ZK/wkghnUEdDMoZOPlnjKFrnoHr2crECg/F5DlarpNZFj03LQ== 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=1780867180; 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=M0zAWcaKqR5x1nIgFVjqgzqkViLt5wAcpL5fADJq4Ck=; b=cpV2Ia0qjA6UqS0t5IVpGyjdgWHl5DK3N6IXh+NdDXoa68MDj2fQd0Gg5rYlJNo4OhbKth sgjTwkL0C6Er3U/mFCBGYFYVKbZka99TrCa9WIgk1TGjDV2Asue44l5fCAA4e5Xa52JgSS HTfj3sB7EWX1nbigYg5TGqGShrGXa/oqCBMGuJTgjXb5IU+fgSjlooOPqIG54TyMFldsbz uWNISpwUN4WynyeMdydY/zFVxecf5MjAKbhUVdIfHeAoCsYRoK7s3L6JADhVjcfoXU0Z7B DcbvUiNmqiV4ZiBMEc8k1ZbdVjqwFM4pDo4qqhfOiBvBhAoKQguP+I3mYKfK7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYSjm4NnHz3V4 for ; Sun, 07 Jun 2026 21:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4723b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Jun 2026 21:19:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b8a97cc677df - stable/15 - rc: virtual_oss: Wait for process to exit 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 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: b8a97cc677dfbb38b6c333d00e241cfdf223a684 Auto-Submitted: auto-generated Date: Sun, 07 Jun 2026 21:19:40 +0000 Message-Id: <6a25e06c.4723b.79a248e@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b8a97cc677dfbb38b6c333d00e241cfdf223a684 commit b8a97cc677dfbb38b6c333d00e241cfdf223a684 Author: Christos Margiolis AuthorDate: 2026-05-21 16:26:46 +0000 Commit: Christos Margiolis CommitDate: 2026-06-07 21:19:34 +0000 rc: virtual_oss: Wait for process to exit Sometimes virtual_oss processes do not exit immediatelly. If we do not wait for the processes to fully exit before returning from virtual_oss_stop(), then the service restart operation might call virtual_oss_start() too early and fail, because it will think the service wasn't stopped and is still running. Reported by: jrm 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 803f686938ec2472d54a26bff668e48cc4999558) --- libexec/rc/rc.d/virtual_oss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index 07f81aeed4bc..dd3bbe41c094 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -76,8 +76,10 @@ 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 "$(cat "${pidpath}/${config}.pid")" + kill "${pid}" + pwait "${pid}" rm -f "${pidpath}/${config}.pid" startmsg "done" fi