From nobody Fri Oct 23 06:21:13 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 4j9tFP1Nycz6wKvq for ; Fri, 23 Oct 2026 06:21:13 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9tFP0YD2z4BGR for ; Fri, 23 Oct 2026 06:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792736473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoDfYHVyfAljzogpglDPcivJp7pzUWdKe10skyTXh7A=; b=piNz/Cwfh7dPI6iVHK9MMyhQSXG/29UM5Pgf8vRG8X/NLkQN367br7kwzjioisw7YZrF0y E9XHyUIkXROCFCvD2P6vVjcNEBfG3ambAHQxWe9d5lbHw+gdh5zh4Qw1k4by2zoq0G3kG/ KSIQPYsZBuLz6kj+mAN+yoWlTZ+wjSWMx5uNoUQGSFuiAtCpsId9W4YMB3i44trbX081vD roQ64hsRvIX00xv9h5h1mDOfYRMsNCzqypIjFMKCl0IAkekjKGg2eptn2HLJkTH11TEKNt zGXtzqwdMseYqYwLMM2dIECfemFKUtNg01kpJwRCMuRAzd2T3fZoZ3f2K2fXGg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792736473; b=HMZQQYgmAeMyiWuxAsi2STE3sCZhlHEoOc38ob+IHdJ7X6c9ZacVOYPpLIEwT+F5omRCE2 qw0HkuBYczrQmVoUeoAtQJ9BMWYc3G8QokGWvVAh1i3fWpGAPg640UlDOaQp55BiCenzPU Q2z5Tncm9GQXEeRKvUQIp5S3XJ0VhOdZ7cpAfZOOwADzvI0k0gCCOxUHIXoHWpPulhEn+f QAbU6czzej4VWVvM/yEdkNbHzU/OrhWWECn6oeEfFu9bUFrCr8aaNS8A6YJLDIjOuyyF83 KaXrF/YNC0P5cDHITyG+JF0U4Ziz9qidw2ml57jg5um5dSBjB7FzSMIMVE/M2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792736473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoDfYHVyfAljzogpglDPcivJp7pzUWdKe10skyTXh7A=; b=JORtMuJVwlUvcyW3YHvM79lJR16tX0mx6HTK4MM42Hlzvc2zN6Be1V1pbSJy5SB3UWgois wN94DcCWQh1Km2Ccg3xGP0DONIEdIxuPn9nMB4PVsdBDV7HER0DB6oYOug/yFSFhBTBowm RteyiywXj3TTruHBPuz3e4JlvpilVUC88mFxO4zJYBzzTtL+IpH3ohB9Ip3yAgXWRQS89S 9sS2CRsW91/DdVHmh7GJFb30AaPdDBlKr1Gn4RQyLpo0Nr9VRi2csZzI+zTepmioiIpFRY Y3T2BFNVzHQO9VxgMGbo773025wUBan1qseZ33jGHaDnukqGLxBPJ4rH3Y878g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j9tFP0CZ7zG5Y for ; Fri, 23 Oct 2026 06:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 465eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 06:21:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Adam Mizerski From: Baptiste Daroussin Subject: git: 6c43154570ec - stable/15 - nuageinit: fix support on OpenStack List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6c43154570ecb4ead4174368206855c0dbea6801 Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 06:21:13 +0000 Message-Id: <6adafcd9.465eb.1ed66464@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6c43154570ecb4ead4174368206855c0dbea6801 commit 6c43154570ecb4ead4174368206855c0dbea6801 Author: Adam Mizerski AuthorDate: 2026-09-16 13:40:15 +0000 Commit: Baptiste Daroussin CommitDate: 2026-10-23 06:20:57 +0000 nuageinit: fix support on OpenStack Change added in 90a7728cd8905cd26b90d06f7873df8bad43ae9a contained a lot of bugs: - If all network interfaces correctly respond to DHCP, then pwait was waiting forever. - If there was more than 1 interface, then "cat /tmp/ephemeraldhcp.*.pid" joined pid numbers into one long string. - "for iface in $left; do kill -15 $left; done" is not using $iface. Tested by: adam.mizerski@ovhcloud.com Sponsored by: OVHcloud Pull Request: https://github.com/freebsd/freebsd-src/pull/2436 (cherry picked from commit 13d5f20e5b9ecb42ecf7de4e98d5af0bd5d63c82) --- libexec/rc/rc.d/nuageinit | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index e2f0a85bc3bc..43476a71c9eb 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -55,16 +55,14 @@ nuageinit_start() case "$product" in OpenStack*) mkdir -p /media/nuageinit/openstack/latest - ifaces=$(ifconfig -l ether) - for iface in $ifaces; do - dhclient -p /tmp/ephemeraldhcp.$iface.pid $iface - done - pids=$(cat /tmp/ephemeraldhcp.*.pid) - left=$(pwait -op $pids 2>/dev/null) - for iface in $left; do - kill -15 $left + for iface in $(ifconfig -l ether); do + timeout 10s dhclient -p /tmp/ephemeraldhcp.$iface.pid $iface \ + || rm -f /tmp/ephemeraldhcp.$iface.pid done fetch_openstack + for pidfile in /tmp/ephemeraldhcp.*.pid; do + pkill -F $pidfile + done citype=config-2 ;; *)