From nobody Sun Jun 28 18:40:30 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 4gpJBR0lcWz6jkWN for ; Sun, 28 Jun 2026 18:40:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBQ4jwDz3Y0d for ; Sun, 28 Jun 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672030; 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=3Lwf1PGQ9GxM1g0DUS4DwfblUJsCH2IDbymLwqkIZBQ=; b=bMuVKVd97qbDdAbyMACluTEF7fO2FQ33avSATRdNYmaIhYftNTpdcDCuGPGybjs/tF1PFb Bc/GcJ5RG+xiUAP2dBUCw2qjgApwX4gjcOjc1detLYCntlCJ1Rwo0+i04ekUkj0wA22+CF u9JiawQR6mOh+3eGT2AbOx9S+kadKFBcQ4k/o3tf0vlK/8T7+9ytG6unm91Z71AZPAKZwu QnSWK4q3IheNSQYZBzGFQMWKDpWCBHIKX2G2g9oJaVsI1UpW5gk3p16J9t6koRLDEldr9b j+LgsnQ4Yr5rrbRTbBP01VS0FxbE6I1xtRN2rdrS1Syv63Q94m1EE0w2FcN3uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672030; a=rsa-sha256; cv=none; b=q4YefUZv+VlsOJbUsvx1HrNhKgurjyvyjH5B72q6Wp47Gfq4sfTkplRKfRq8BUsy0Id8If 4Q4jBVK3Pl+Vp50mgxRLxqIwVzQ71MrnxwEReWPC2EPXyeAKl4bbr1mxp+FpLWGISZGxFU U2ect6rfqsFojRGt+Vv/Bmxyv8h1TrV0EnxtG7414LvFNJKx4D6DQ40eskQkWuwBJHzvzg czoPVh31keDg8EBchLZu5tFbEgYXjsA6Pu+EXn33lQrkI3VrQfgr/Bqr21p4AP3ptCb8F1 tGn2gjpyAq5sCqR8iXVYAHQr34EyvJwHwYfNDOdlKnfCcI3v4LR8TUHnVLwTyA== 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=1782672030; 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=3Lwf1PGQ9GxM1g0DUS4DwfblUJsCH2IDbymLwqkIZBQ=; b=bILHFwkBBB0/cm0wqEksRatJ2wOJgPzBxOk0Eyfec/nbqdqxf4pNbMssCpwumeDABP0kTZ ZJn+k6ydxmlnPZKsFAV3fhq4w6oR4BDOCk9tiGpldnHM3VXRDcekpvuc2crKOhlYhxKKZi 5Es+bXh77TUoDsXN6kfuLde4bti4r+pHZffxkbxsR4i3tGDt8IhPyv5KDGKLdi3ShDzd3M fQ2VtXbN8aKidIieuBvfM7ClzjZi466pLGokErBF7Aoa6Sibu97Xe69ijbRmFlZuQzNTTD ova9jMKXeLoMpS5whh9tl6h8tJXx0I7e8W0QHTbdjEqnWNeU6t+Cc0/dqIEWOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBQ3g3bz7CG for ; Sun, 28 Jun 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19efd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 178f400cf643 - stable/15 - nuageinit: implement bootcmd support 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 178f400cf643280daa982a1ca70dfccc17ba1137 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:30 +0000 Message-Id: <6a416a9e.19efd.dd68da6@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=178f400cf643280daa982a1ca70dfccc17ba1137 commit 178f400cf643280daa982a1ca70dfccc17ba1137 Author: Baptiste Daroussin AuthorDate: 2026-06-05 05:00:00 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 nuageinit: implement bootcmd support Add support for the 'bootcmd' cloud-config directive, which allows running commands very early in the boot process, before the hostname is set and before the network is configured. - nuageinit: bootcmd() function follows the same pattern as runcmd(), writing commands to /var/cache/nuageinit/bootcmds instead of runcmds. It is the first entry in the pre_network_calls table. - rc.d/nuageinit: execute /var/cache/nuageinit/bootcmds immediately after /usr/libexec/nuageinit completes, before unmounting the config drive. This ensures bootcmd runs before NETWORKING per cloud-init spec. (cherry picked from commit b9be7608cd13888a32815bfb2263e20855706969) --- libexec/nuageinit/nuageinit | 18 ++++++++++++++++++ libexec/nuageinit/nuageinit.7 | 5 +++++ libexec/rc/rc.d/nuageinit | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 166c3503735a..bfe5f893756e 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -524,6 +524,23 @@ local function disable_root(obj) end end +local function bootcmd(obj) + if obj.bootcmd == nil then return end + local f = nil + for _, c in ipairs(obj.bootcmd) do + if f == nil then + nuage.mkdir_p(root .. "/var/cache/nuageinit") + f = assert(io.open(root .. "/var/cache/nuageinit/bootcmds", "w")) + f:write("#!/bin/sh\n") + end + f:write(c .. "\n") + end + if f ~= nil then + f:close() + nuage.chmod(root .. "/var/cache/nuageinit/bootcmds", "0755") + end +end + local function runcmd(obj) if obj.runcmd == nil then return end local f = nil @@ -794,6 +811,7 @@ if line == nil then -- YAML user-data elseif line == "#cloud-config" then local pre_network_calls = { + bootcmd, sethostname, settimezone, groups, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 08a64b11ff58..3cc0eceeb2ae 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -362,6 +362,9 @@ does not automatically install them. Ensure the relevant command is listed in your .Nm packages section. +.It Ic bootcmd +An array of commands to be run early in the boot process, +before the hostname is set and before the network is configured. .It Ic chpasswd Change the passwords for users, it accepts the following keys: .Bl -tag -width "expire" @@ -424,6 +427,8 @@ Here is an example of a YAML configuration for .Nm : .Bd -literal #cloud-config +bootcmd: + - kldload if_bridge fqdn: myhost.mynetwork.tld users: - default diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index 259ce3c138e5..e2f0a85bc3bc 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -89,6 +89,10 @@ nuageinit_start() /usr/libexec/nuageinit /media/nuageinit $citype 2>&1 | tee -a /var/log/nuageinit.log ;; esac + if [ -x /var/cache/nuageinit/bootcmds ]; then + echo "Executing 'bootcmd'" | tee -a /var/log/nuageinit.log + /var/cache/nuageinit/bootcmds 2>&1 | tee -a /var/log/nuageinit.log + fi if [ -n "$drive" ]; then umount /media/nuageinit rmdir /media/nuageinit