From nobody Mon Jun 23 07:44:15 2025 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 4bQg7z6PD9z5ywKP; Mon, 23 Jun 2025 07:44:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQg7z4qMQz4CMy; Mon, 23 Jun 2025 07:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664655; 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=CqMyDFAK+EZFONgkDTqSvKp92BOBwjNaBBfeMbWChUI=; b=siLgbE7lhxxto+calBC71ORGNYEAZ3bZySgkRIHTXaw3ZYVDENWmOcSpK/EMUrLYQIC+R5 JrZ7W3pj64Nt4mOO+Rs3JWlyT8K7uOl57ea5M+1lr0ZnBKarpuJBcWPDo9UB+EnnNI2x7r vI993p67gz1mS6f++yjqXCXmHOHQjwZbZQKWBTahXacCQeF/WAtdmAGOMUOeQ98BSahjUW O4E3fjKCQN48vA3pbPz1covM+zf29egtM3FVFB9pNWZqWk1VfwTEMxMgzDTjxDlYcPcD+L lqzgkrBRwxEnFeTweedad0WfJu05S9iiyZRaP0r2xEQVOgYMyiiHh1wN9FiRDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664655; 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=CqMyDFAK+EZFONgkDTqSvKp92BOBwjNaBBfeMbWChUI=; b=XwFyIImZEjvePjwU/XTxOe7p9SRu3WI8wkkzvaDkkHcRe4TKtLk5ninReQPm1InawWrgMV szqxUNcCzwN4O8dr3CubWSAF0Z3BRyytUbfF3jQAf2CG2Qfbe1W22S7m7ZrikD4/TLAoV2 JM8Ihr5xsBX1tuCO8VoZM8PT2LShxbsuZl2ytvNyaUfqspl+IXNLpdVxmWe4jOVF9fCSr1 NdI8SS+skpWyRleiOdWzs5XO0ZzCiW54bmIJhKJHscwJoUysNQMnt1qrgEoduamQXCrkth ylfXNI/wDAwsxLx53Fz4FVc/CxgDnO1pqAMl4JtSagRzkwypE7PePxFb+GLbKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750664655; a=rsa-sha256; cv=none; b=CC8nnQh6cazlWUMEDOL380lVrugq3Hs1URzMp1XFekEL+ha5s/Akoi/SSMe2gpOOqFHlsl mrVRgEstI94KI33FZx8J4wctZ243zBZkrO8GT6uGZxhanwScK+qsbz4EBM+TNA8yW+/xqn 4C8eLpMzTaigMt3dgfHVoUCGZPOVpyw3YBLgkBa5S9YRYttjDW9RfiydVt9F/V+hZJPX2U i4gjskATw5X14Bpw8AxZi5z04FPdmy8rbSmHa/0Qwpn2123wBebGEWazZU7744jLWfn1dZ mus4yoOEP2x4qBimtfZFwZO1AfhsE4p1FimHKnqdgi5N7qtwXtRDksWqSEd6jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bQg7z3x64ztYs; Mon, 23 Jun 2025 07:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55N7iF3O067351; Mon, 23 Jun 2025 07:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N7iFFW067347; Mon, 23 Jun 2025 07:44:15 GMT (envelope-from git) Date: Mon, 23 Jun 2025 07:44:15 GMT Message-Id: <202506230744.55N7iFFW067347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 279f98470572 - stable/14 - nuageinit: pet luacheck 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 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/14 X-Git-Reftype: branch X-Git-Commit: 279f98470572f39c6ead7ecce973c4eefbceeecf Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=279f98470572f39c6ead7ecce973c4eefbceeecf commit 279f98470572f39c6ead7ecce973c4eefbceeecf Author: Baptiste Daroussin AuthorDate: 2025-06-10 09:32:06 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-23 07:43:12 +0000 nuageinit: pet luacheck Rename path into ni_path (ni stands for nuageinit) which is more understandable and avoid a shadowing warning because we also use a variable named path later. Add a missing local (cherry picked from commit f678c47590276aa8acdacdecfb78cc6c44bbf449) --- libexec/nuageinit/nuageinit | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index cd5912c54975..c874f40b38a8 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -12,7 +12,7 @@ local sys_stat = require("posix.sys.stat") if #arg ~= 2 then nuage.err("Usage: " .. arg[0] .. " ( | )", false) end -local path = arg[1] +local ni_path = arg[1] local citype = arg[2] local default_user = { @@ -189,7 +189,7 @@ end if citype == "config-2" then local parser = ucl.parser() - local res, err = parser:parse_file(path .. "/meta_data.json") + local res, err = parser:parse_file(ni_path .. "/meta_data.json") if not res then nuage.err("error parsing config-2 meta_data.json: " .. err) @@ -204,9 +204,9 @@ if citype == "config-2" then nuage.sethostname(obj["hostname"]) -- network - config2_network(path) + config2_network(ni_path) elseif citype == "nocloud" then - local f, err = io.open(path .. "/meta-data") + local f, err = io.open(ni_path .. "/meta-data") if err then nuage.err("error parsing nocloud meta-data: " .. err) end @@ -229,9 +229,9 @@ end -- deal with user-data local ud = nil local f = nil -userdatas = {"user-data", "user_data"} +local userdatas = {"user-data", "user_data"} for _, v in pairs(userdatas) do - f = io.open(path .. "/" .. v, "r") + f = io.open(ni_path .. "/" .. v, "r") if f then ud = v break @@ -243,7 +243,7 @@ end local line = f:read("*l") f:close() if line == "#cloud-config" then - f = io.open(path .. "/" .. ud) + f = io.open(ni_path .. "/" .. ud) local obj = yaml.eval(f:read("*a")) f:close() if not obj then @@ -405,7 +405,7 @@ if line == "#cloud-config" then end elseif line:sub(1, 2) == "#!" then -- delay for execution at rc.local time -- - f = io.open(path .. "/" .. ud) + f = io.open(ni_path .. "/" .. ud) local content = f:read("*a") f:close() nuage.mkdir_p(root .. "/var/cache/nuageinit")