From nobody Thu May 28 14:07:01 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 4gR7b96LxTz6fnKV for ; Thu, 28 May 2026 14:07:01 +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 4gR7b9539nz3d2s for ; Thu, 28 May 2026 14:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779977221; 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=JJVEqDVcwkgy+XDSWbmIby0RGLyJQSlaWV5EjT687Ck=; b=s2MeCZ+NKfL9uI0zB+cG35FK9n+kvC9jZWLpAvvBAzGFcS8mERfyl7sB9BTZUE3KEn0GeJ 0+GZSY4e2oej9IAd/RtWaiTT+PfGVIyzkIrXPE76faKMiwbNFdfkaOOSkyMG4mC5yIhDua 4NjsxM1QhrqR8dTJerTCn8SNMlAjSGlBG1ITrRoUbxaA9OkeVdc9c9Eh4+gSqt/9MPyQQO amPcUWgP9DKUgEw8O01Y+smKO8WYyBnJ0EIK91vfdU7uwhgsoSG2ZzYorh98i4LylZ5exB UQ57sMQWf4jTBwddVC1RohCbHaU8tKJRRjJGQX0hab0FMRUiYw/NTjm5qId62A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779977221; a=rsa-sha256; cv=none; b=MH9hOGUpbq+3hwflwimJMkW9OjJH3vNlZDJl8YXk7AvW2p+ZFDvH3DYHF5ebEyByOFu8xU 5yoJHfSWg9MoBYIdnZqUjMXPEniEiAo6z/ROL7ZFGzZBG6dSSVFGwfuYjbt1Rgpkrm/zqY mr5fjZhPuDrnywDcN+MvETQD+rcuDqqLB8sTj54VN5wcQuzNOj7TDMbPTAu60wk7ykovFv TmR/ViS6v6V+thTWyh2Lx/abbapH4JuysQEd97vxnT06qCbHYUpEspgixZLbm2NZPNlFAh /XXCSHLgC1vKOdFNlXBqnxi63lU1jm2EV8hABoSQTx4Yc5OzUpHpGxvC/kPGeA== 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=1779977221; 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=JJVEqDVcwkgy+XDSWbmIby0RGLyJQSlaWV5EjT687Ck=; b=BTTBq82GNqnm4uEVk3vyX5ZZ1M2WJcxcy0qKSbBYcRexpe9BiGVRUan1pxM0JDy01cJmFA Kh3H8o7uDNAk0yQUUPfFK2TkXhb5/v+J96JGPytYZMTvduQYRV7PH7YK9DIYsbLZZhZn85 AGYcZ/egeNUKNATH7o7k12jK51xoEcCL/hWRgl8p6zJqefWox3JsaydC4EFg4gtExtJiCd H8qIJ+q+Q8qZ5YyOaziMbCnNaCZnO+IutsV5HfA3kSpVgqRiG9xoKCAzJntyTUe8jb8iHi 6858yZPx3vaNBMXSCpTUJkkPEivP9n3li4IZJN4Axd7blC+xx60IjSHSYXkgCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR7b92yfVzqTj for ; Thu, 28 May 2026 14:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f89b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 14:07:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 803f686938ec - main - rc: virtual_oss: Wait for process to exit 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: 803f686938ec2472d54a26bff668e48cc4999558 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 14:07:01 +0000 Message-Id: <6a184c05.1f89b.758265a9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=803f686938ec2472d54a26bff668e48cc4999558 commit 803f686938ec2472d54a26bff668e48cc4999558 Author: Christos Margiolis AuthorDate: 2026-05-21 16:26:46 +0000 Commit: Christos Margiolis CommitDate: 2026-05-28 14:06:06 +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 --- 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