From nobody Sun Jun 28 18:40:48 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 4gpJBn22DVz6jkwg for ; Sun, 28 Jun 2026 18:40:49 +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 4gpJBn06P8z3YJP for ; Sun, 28 Jun 2026 18:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672049; 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=Z+v1Rmgn1yCtStJLjb9041h5u5TYrpCS9v5jpXwUdkk=; b=D7Q6OcTi/K7clH+RiBAkoH/xoOArRLIejmXa/OkMYjutsNQwBp7FwSoWb9kzjI6wNiLr/W mOX2t9mKTYQKoRhlIrl9YdZpbP0g8KF53gXXRuYqJmRe4KhTamPwu9tIZOMkRRrzrTDnvU lLD78TSTnQxKKuFxH3EJbsldVyo1qcRekPGfNyw8JduA55pnKMSFFa/sIH3pXu5FoDsaTD Bm6gQWgKEeio9LN/rw9wq4J3//qEO0Bt+fTOCiVwDMPNKSZZSngPIcI+lb2I9oZVYtJMh7 gk+kWv2nm05Ov8fLIVU99NW6s/A8kKqybvYpxRlYEKqpT5mKip1C67L23Byycg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672049; a=rsa-sha256; cv=none; b=HSw41LA1O/Qn4F47diHjiATeLrwTDJVJ5i7QpiM+F0dwP4/+CtlhkW2HIvkzKKHcc/MIVm ZxnSENsSnC50gNUpARrG1OscSRTrt/GKcDdmww5VmEHUgJCu6VK1PgY4RTZ8JKAls7fq61 9wlnB4Jyb4mqrQ2rufG+PC0CjNpEjLfzfgasA07dsTqCr9OzWFR44LEtvIOrdUxJ4JXFwI ufsf3DaNjpDxfgmLE7S6kAlEdU7ICmtJLhtC8ZAog7VHHOQgUCHJ7hi6ik2SThlfG950CH rLzCBEhZ2SFBxbhK4vSwJ9kHp9/qQJxjmYQaH21cPh74ILssWVcA94xXtzQtaQ== 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=1782672049; 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=Z+v1Rmgn1yCtStJLjb9041h5u5TYrpCS9v5jpXwUdkk=; b=L/NoQerL2VLvvuB6lL7XYn9NnU+6tGXm6OT9Ey1qajW3xZTPtHh5GlnPWJVtfEqW0p9MHR qmE3j1kGln3wg7bsvkT7PVyhdK6715q9He8XL2KiY9x+8elZHOnXd3nUNn6/DxQvnmcrRT iTSLqKBwnT9SLDUoM+YZyIiawFOqT58QQI0nPN2Nr3Czaa3K3K85jgNgUuh3TpiyjzN3WD de+A4q8L0st+JUIHaBm8exoyzh+LEovKqYMR3bRiVddAU5MOQpLORmEA1u5dOzope6IUgb QH7talSJOPFjL6IHGIpgijFzyKV5LmrO40x8YhwibhzPuRYZIvLWId1PmxSZ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBm5bMTz75t for ; Sun, 28 Jun 2026 18:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cba2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: eb677a598e68 - stable/15 - nuageinit: implement final_message 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: eb677a598e68f3e52066089a4d2a6f7b06fb43b8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:48 +0000 Message-Id: <6a416ab0.1cba2.3158f4ec@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=eb677a598e68f3e52066089a4d2a6f7b06fb43b8 commit eb677a598e68f3e52066089a4d2a6f7b06fb43b8 Author: Baptiste Daroussin AuthorDate: 2026-06-05 21:03:45 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:34:06 +0000 nuageinit: implement final_message support (cherry picked from commit e01f202ecf9344bd6658869a869f36c5b3790384) --- libexec/nuageinit/nuageinit | 25 +++++++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8a9c5c022862..1391aff13bd6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -784,6 +784,30 @@ local function power_state_change(obj) os.execute(cmd) end +local function get_uptime() + -- Get system uptime in seconds + local f = io.popen("sysctl -n kern.boottime 2>/dev/null") + local boottime = f:read("*a") + f:close() + local sec = boottime:match("sec = (%d+)") + if sec then + return os.time() - tonumber(sec) + end + return 0 +end + +local function final_message(obj) + if obj.final_message == nil then return end + local msg = obj.final_message + if type(msg) ~= "string" then + nuage.warn("final_message must be a string") + return + end + local uptime = tostring(math.floor(get_uptime())) + msg = msg:gsub("%$UPTIME", uptime) + nuage.warn(msg, false) +end + local function chpasswd(obj) if obj.chpasswd == nil then return end nuage.chpasswd(obj.chpasswd) @@ -1090,6 +1114,7 @@ elseif line == "#cloud-config" then users, chpasswd, write_files_deferred, + final_message, power_state_change, } diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 21cd2e8f17c5..2b4d316fd5ff 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -45,6 +45,8 @@ atf_test_case config2_userdata_power_state atf_test_case config2_userdata_locale atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files +atf_test_case config2_userdata_encode_base64 +atf_test_case config2_userdata_final_message setup_test_adduser() { @@ -1382,6 +1384,38 @@ EOF atf_check -o inline:"hostname=\"host\"\n" cat ${PWD}/etc/rc.conf.d/hostname } +config2_userdata_encode_base64_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + atf_check -o inline:"dGVzdA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('test'))" + atf_check -o inline:"dA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('t'))" + atf_check -o inline:"dGU=\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('te'))" + # Roundtrip test + atf_check -o inline:"hello world\n" \ + /usr/libexec/flua -e "print(require('nuage').decode_base64(require('nuage').encode_base64('hello world')))" + # Empty input + atf_check -o inline:"\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64(''))" +} + +config2_userdata_final_message_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + export NUAGE_RUN_TESTS=1 + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data << 'EOF' +#cloud-config +final_message: "System ready after $UPTIME seconds" +EOF + atf_check -e match:"System ready after [0-9]+ seconds" \ + /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet +} + atf_init_test_cases() { atf_add_test_case args @@ -1422,4 +1456,6 @@ atf_init_test_cases() atf_add_test_case config2_userdata_locale atf_add_test_case config2_userdata_fqdn_and_hostname atf_add_test_case config2_userdata_write_files + atf_add_test_case config2_userdata_encode_base64 + atf_add_test_case config2_userdata_final_message }