From nobody Fri Jun 5 11:18:08 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 4gWzSc6vL1z6gtgp for ; Fri, 05 Jun 2026 11:18:08 +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 4gWzSc4VPbz3vsR for ; Fri, 05 Jun 2026 11:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780658288; 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=GMG6q7rLSBWxvuCVbjNQI2DoxagQMRdhOlygje+w2m4=; b=vcVET219OTdmedKnnPI1YnHtsNq4K7QI/A3PkXjcm8r7qfN/YpdPJUIw4WD7pStSyVPMDr oP6VGD4dpPMTTDCl3fOAr61diXQIBF1n0Na2GaxX4doUmC4PoZedGgmi+Qc6bmfXt5A6be YmC/ywQ2OcQc2LMn2PqObkng2PIZGqAOfahI38g8OiwYjCcClbAfpwPJJmQsGCx/z6EFOe l7ZHctK6pwjZsXwsFC/AYjBVW93efXnxZuPJ/m8WHEwIggiK1KsK2SQ99kmvfU5lnYT/W6 Z4t12y0r4bXwGjKLvSMcL9R+YDcEO25rADolUxBehlB96w+eV+/0vBQD9BVcgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780658288; a=rsa-sha256; cv=none; b=sru+An/wzMdgaCyfcARit6hiow7KzKjFK6WInf9I23RjLsLRyYbZ1t6iZcUcunYFjsj8oS 0WyI6z7Kj1kMeJJc1HmuJA6fjbEfjjgjy41y9aHG41UbDtEAwT2Nb2gNKZWHr6Q4PohbzM qat8WKnnzoLgkcjfNEtON8wgI3zdHOnWJq4I2/D9Hh3hUT67v+71N0RSlw9rdaGUjHfX/e Y9VL8gOEHmo5XT+RKLoB7BtJweEv3mNCFEs+tmqHvBdiCRaFpkTqDL5Rq7+bfPXbztySz/ SkuWem04omYtN9Fw00fCq98xlT2pyzVm5trGK4vtC420pmfDXriIi+kkrg0b9g== 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=1780658288; 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=GMG6q7rLSBWxvuCVbjNQI2DoxagQMRdhOlygje+w2m4=; b=QKLy2mdj71iRqk4A9RRw53n6p99VJRwnEZsVQwsFZHYMsBXLHDGci3PjK229N/ZGEhJlbf yonxdFpuQpaqMXVSSQmS5925TtnhPLFnHWpuCgEt7xGmur1fOyP3axBwYlukRSQMVu9KS2 HpL7jzi6CduE6tXmn5cqCI8GlTKDNA9lTTtBMvvawXl/K+6PsOh6AOVdw6xHm6uCFjT1gX nUIYOrMxI86aQHU4f9HFsdhEfBDX8iPiuy0fLkhRKWk1AxM8zj7CbfNKbUfxGOzWZA0ivg kd5/ZZDPnO74SiuckxXS/OvWixoMTcvBjGS8IFO1SI/fWmaKiD5aqKdILCMNVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWzSc3wzJzBNn for ; Fri, 05 Jun 2026 11:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 11:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4662263c246f - main - nuageinit: implement resolv_conf 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/main X-Git-Reftype: branch X-Git-Commit: 4662263c246fd9c31cf0f03089845140114445bc Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 11:18:08 +0000 Message-Id: <6a22b070.1cd6f.2048fa23@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4662263c246fd9c31cf0f03089845140114445bc commit 4662263c246fd9c31cf0f03089845140114445bc Author: Baptiste Daroussin AuthorDate: 2026-06-05 10:06:02 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-05 11:15:37 +0000 nuageinit: implement resolv_conf support Add support for the 'resolv_conf' cloud-config key which writes directly to /etc/resolv.conf. --- libexec/nuageinit/nuage.lua | 32 ++++++++++++++++++++++++++++++++ libexec/nuageinit/nuageinit | 6 ++++++ libexec/nuageinit/nuageinit.7 | 17 +++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 34cf8c9fc090..7fde2d936f1b 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -837,6 +837,37 @@ local function add_fstab_entry(root, device, mount_point, fstype, options, dump_ return true end +local function write_resolv_conf(root, config) + local path = root .. "/etc/resolv.conf" + local f = io.open(path, "w") + if not f then + warnmsg("unable to open " .. path .. " for writing") + return + end + if config.domain then + f:write("domain " .. config.domain .. "\n") + end + if config.searchdomains then + f:write("search " .. table.concat(config.searchdomains, " ") .. "\n") + end + if config.sortlist then + f:write("sortlist " .. table.concat(config.sortlist, " ") .. "\n") + end + if config.options then + local opts = {} + for k, v in pairs(config.options) do + table.insert(opts, k .. ":" .. v) + end + f:write("options " .. table.concat(opts, " ") .. "\n") + end + if config.nameservers then + for _, ns in ipairs(config.nameservers) do + f:write("nameserver " .. ns .. "\n") + end + end + f:close() +end + local function remove_fstab_entry(root, mount_point) local fstab_path = root .. "/etc/fstab" local f = io.open(fstab_path, "r") @@ -891,6 +922,7 @@ local n = { addfile = addfile, add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, + write_resolv_conf = write_resolv_conf, } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f56d1207cf01..8fef3bb662d1 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -531,6 +531,11 @@ local function disable_root(obj) end end +local function resolv_conf(obj) + if obj.resolv_conf == nil then return end + nuage.write_resolv_conf(root, obj.resolv_conf) +end + local function mounts(obj) if obj.mounts == nil then return end for _, m in ipairs(obj.mounts) do @@ -870,6 +875,7 @@ elseif line == "#cloud-config" then ssh_deletekeys, ssh_keys, network_config, + resolv_conf, disable_root, ssh_pwauth, runcmd, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index c2981669acb7..8ef9d8b284ea 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -195,6 +195,23 @@ The pass number for .Xr fsck 8 , defaults to 0. .El +.It Ic resolv_conf +An object configuring the content of +.Pa /etc/resolv.conf . +.Pp +The following keys are recognized: +.Bl -tag -width "nameservers" +.It nameservers +A list of IP addresses for DNS name servers. +.It searchdomains +A list of search domains. +.It domain +A single domain name. +.It sortlist +A list of IP/netmask sortlist entries. +.It options +A dictionary of resolver options. +.El .It Ic timezone Sets the system timezone based on the value provided. .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 11d34fcd98ea..0f758bcac1cd 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -35,6 +35,7 @@ atf_test_case config2_userdata_disable_root atf_test_case config2_userdata_bootcmd atf_test_case config2_userdata_manage_etc_hosts atf_test_case config2_userdata_mounts +atf_test_case config2_userdata_resolv_conf atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files @@ -1140,6 +1141,36 @@ EOF true } +config2_userdata_resolv_conf_head() +{ + atf_set "require.user" root +} +config2_userdata_resolv_conf_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data <