From nobody Tue Sep 03 07:08:19 2024 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 4WycCm2PW6z5MQgZ; Tue, 03 Sep 2024 07:08:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WycCl6j8Dz4THC; Tue, 3 Sep 2024 07:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725347299; 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=sAvcS3LV85YA30WTuXICg0Gz4RfT1v334FOaqLZifes=; b=pl5LOAql66CLjTLraEVUu2JWVJksiP52IKHUK+c2F1/Z9jUAr1ihgzz4jDungEzFogT5MJ 45X2vtpMU6oYxqiM7RiciVeFncCuu24lRQH+dyWadlw+EJ1oCuoGVoVLvGSz88cxgYGCWK iG7Vb8fAlxMqUI3C8hP+HIRFENqx2bJXn+eDMlNNFxdjcZiKBVyTZT2rFYDXJYiWNJ95eL eqv/83T8e/cM4fo1KITYqEdMlNSUOE1KuS/l1wR17I1sMpejb5Mb9H99T11adBwJnLwYDU FtVeMiA/UI6q/Q2XFq3lnyL+m5aaDUQtG3jy2r9nPffBXP9FNM/LIpp8Na6QBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725347299; a=rsa-sha256; cv=none; b=a4ZA/l75IAcbN6Ny0u2quzj9r8zdn6xGRUWJ+LbVsqFczVWPq6jKbn2KrlvhroWBAW9ikr BiW31xn2LgPXpV3yoKMCcw7BBk1PKsmSA53gPsbDnkgeX95A7tUPQ7K4UiMY9vQkyICmhO 0adt04rItvUgOfIWDk2jAAiFQjtiEqAzDWIhcwrQW7HMcEnkAuYN14N9bkvvzQEzs+ATiG mWpYx45Je/Q/mV3dBONLQ+0F0BnCtI0tQ4PV74pG0yxdZ5gIgtw9Dak2gitMyqithuYCun yNM13K6WZk+IwH4amHd9AIxwedFlCYcvntykrP1kb3sbuvBseydD0kUGBA0GWA== 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=1725347299; 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=sAvcS3LV85YA30WTuXICg0Gz4RfT1v334FOaqLZifes=; b=heverjzD63YvEfGL4ihzkU4ew+KNDQ/p6ZRlZr+jYaNTnfxjCS0LUyMVnr2rv/lQcihCnB 1DdCN1n6YoC6JO1+FWAHNOB+n0L8rQ/5fKEyIMjVxV5badGVneGHIqFFKbWA4IqWppkl3H l95/LAdTiQg/SPziPSQ1oq5aaKnfzXnTkMJ/0wN3LYxKcGqbARYVik9MBP5Pk4xLP+2L7i oQubjefaqXEh000flbShMnQVG8dg1zHwpqmcUBarz3hH4KCIzmTVw1ONxGB1gi1HIp857P 5y615BAkNuWB/nQ78HlkGIDjmCfn4KCm4ck8IbiL0LVYKzI7iBnnvnct4x/Z3Q== 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 4WycCl6K7BzWl8; Tue, 3 Sep 2024 07:08:19 +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 48378J5r069121; Tue, 3 Sep 2024 07:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48378Jtu069118; Tue, 3 Sep 2024 07:08:19 GMT (envelope-from git) Date: Tue, 3 Sep 2024 07:08:19 GMT Message-Id: <202409030708.48378Jtu069118@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: 3dbc333a9ef4 - stable/14 - nuageinit: Fix the homedir variable name 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: 3dbc333a9ef40c71f56507c672e919547eaea248 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3dbc333a9ef40c71f56507c672e919547eaea248 commit 3dbc333a9ef40c71f56507c672e919547eaea248 Author: Jose Luis Duran AuthorDate: 2024-07-23 19:54:54 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-03 07:05:24 +0000 nuageinit: Fix the homedir variable name cloud-init uses homedir, not home. (cherry picked from commit 7aecd689e362330a035a199afbe5707a8c4edc9c) --- libexec/nuageinit/nuage.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 10451dc0bdc4..cca1fe9b4678 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -86,8 +86,8 @@ local function adduser(pwd) if not pwd.gecos then pwd.gecos = pwd.name .. " User" end - if not pwd.home then - pwd.home = "/home/" .. pwd.name + if not pwd.homedir then + pwd.homedir = "/home/" .. pwd.name end local extraargs="" if pwd.groups then @@ -120,7 +120,7 @@ local function adduser(pwd) end cmd = cmd .. "useradd -n ".. pwd.name .. " -M 0755 -w none " cmd = cmd .. extraargs .. " -c '".. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.home .. "' -s "..pwd.shell .. postcmd + cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s "..pwd.shell .. postcmd local r = os.execute(cmd) if not r then @@ -136,7 +136,7 @@ local function adduser(pwd) cmd = cmd .. "lock " .. pwd.name os.execute(cmd) end - return pwd.home + return pwd.homedir end local function addgroup(grp)