The branch main has been updated by bapt:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=90a7728cd8905cd26b90d06f7873df8bad43ae9a

commit 90a7728cd8905cd26b90d06f7873df8bad43ae9a
Author:     Baptiste Daroussin <[email protected]>
AuthorDate: 2026-01-29 09:56:33 +0000
Commit:     Baptiste Daroussin <[email protected]>
CommitDate: 2026-01-29 10:03:06 +0000

    nuageinit: support fetching configuration on multiple iface
    
    On some environement a VM can be connected to multiple ifaces but only
    one will respond to dhcp and able to fetch the metadata.
    
    Launch the early dhclient on all available ifaces and as soon as one
    dhcp has successfully configured an iface, proceed with fetching the
    metadata.
    
    MFC After:      1 week
    Reported by:    [email protected]
    Tested by:      [email protected]
    Sponsored by:   OVHcloud
---
 libexec/rc/rc.d/nuageinit | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit
index c901971488bd..259ce3c138e5 100755
--- a/libexec/rc/rc.d/nuageinit
+++ b/libexec/rc/rc.d/nuageinit
@@ -56,10 +56,15 @@ nuageinit_start()
                OpenStack*)
                        mkdir -p /media/nuageinit/openstack/latest
                        ifaces=$(ifconfig -l ether)
-                       set -- $ifaces
-                       dhclient -p /tmp/ephemeraldhcp.pid $1
+                       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
+                       done
                        fetch_openstack
-                       pkill -F /tmp/ephemeraldhcp.pid
                        citype=config-2
                        ;;
                *)

Reply via email to