From nobody Thu Sep 17 15:34:28 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 4hm0DV1VMpz6tBQ4 for ; Thu, 17 Sep 2026 15:34:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hm0DT6P9zz4X2G for ; Thu, 17 Sep 2026 15:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789659273; 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=tJIg4w8YrPQJA40wow3Nuk13aJMO87E5Qt3c75srW2k=; b=j3gXVgRY2dXUiU+vjpm+F6fhzSIh77KDDG80u/xNKgVkNaeHSjNtwki7jfXMgEnsfSNCMr UvNnPgtpIAidPMEA+Bh6bj+bkbXjTbrNQMnf4fRn/1AHJ6q7GhVCG1JbKmAMx1t86Rp0lL r1nBaMHEpT+geKFSLEHF3N4haHjrwgytqgdlBZED7PbOckRSnucre1AIHvGNCqNrU+bRj7 06ozNjkcrgVT1BJe2ilj9T1+WG02WroIAvj0pXzw8JhjRIDf3dKqFphxWyTpmgxZ4D3sUG J8zAZ0OzoetkOKnmfzgBalwg+xa+MQhZg1Clf+qgci5Xhs7QshfmJCmuBi3l6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789659273; b=DBIaCM03VunwbmWqMtTZ0tgSm4LS+f1lCJxNvB+OQpycoK9IuTNzfz+kCi8utYD4sJi+jj 9dqql6Z3UHNzn96JKpb0E5MPiZwRfrT5J3cBIBECvzit/2yBI5byCVCX2ZUBC/ayw9iXrO EKMo45pTzvmzZ+eGuMdb10/PA+gfit2BFEKStEI6v8sBvDHoOfKhoFeKMg2Vx2VJ0/aT1n TLoP2+84V9jjhogVR8LfIFIQUvu3EYGNsSTR9bSUWG15HqEHk92KclgVHgcJCzrXwd92p9 3xfIC1vtLI7GJqQLE1L0OG2wAeRFFSv22nDyvGh3CCsA8stoJIHJGe2KoGFTnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789659273; 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=tJIg4w8YrPQJA40wow3Nuk13aJMO87E5Qt3c75srW2k=; b=hrzuuRwV93hPPPuauxXnm746i5ax0fuzY2J8jhnkQWwVsleCexwg6FzygrAJ/1Jd+GCZpy X5mGIPjKmMwN+UpgZl7xqYwchfbEF3aNCsyaz2SnN/wc7USPpTzjQz92IWE3Wpc65MdiZc lOSPg6Pb9KdmDJSc6x7XuscHu3ksfn//LsQLHFCPqWw5TE3Lu6RXTbXY1aRaUviKrOrm4z qVndWYu0tsFH7L5XF+c1xhUPhYZD/pJK448MXU9CvxzwyqaZ1xJ93Cp7fnOOKdg/PV7Xty dQZx50CujYV6DoKjqpOUM4djjtYIECucoZZwccbChXjIeuEZojEui5xjRqmE2Q== 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 4hm0DT4lTDzfvF for ; Thu, 17 Sep 2026 15:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1894d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 15:34:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Adam Mizerski From: Baptiste Daroussin Subject: git: 13d5f20e5b9e - main - nuageinit: fix support on OpenStack 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13d5f20e5b9ecb42ecf7de4e98d5af0bd5d63c82 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 15:34:28 +0000 Message-Id: <6aac0884.1894d.2662ee95@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=13d5f20e5b9ecb42ecf7de4e98d5af0bd5d63c82 commit 13d5f20e5b9ecb42ecf7de4e98d5af0bd5d63c82 Author: Adam Mizerski AuthorDate: 2026-09-16 13:40:15 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-17 15:32:37 +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 --- 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 ;; *)