From nobody Thu Jul 25 09:17:17 2024 X-Original-To: dev-commits-src-main@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 4WV4z13HvYz5Rgcc; Thu, 25 Jul 2024 09:17:17 +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 4WV4z11Lqzz40n7; Thu, 25 Jul 2024 09:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721899037; 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=LWnE5kAnr/di0A1gwudzvftKt1Cb4PuCxmedeCw1KkU=; b=v1TXEyuZQiZSrKZGqhe1f1yMx68UaDSYO9FgkAoTbVfZU4KDTsKAlMYefhm8hke5RJXMkQ 0tCkRWuVwhkYwys2tLeLtyswXkd61G9bQArKgis7aKvbbsZPRcCk0lOUMrGGvy5w9sgdrE mJuTwbx0bNQeOV/9yU5eZis7SiiuU+MwmBXi3cshvSFX7LASG+5jz3XPG4aeYmDpNFKQX7 AjGVXS+FrHR1f66oHB5xZUBUgVrmtw8EduJZIcg39/2obXAtT/dMkpVMKdhYSva+rupwrF XurL/w9ZoU+ZO41MnFL0us3rr0F0M3d2oLKs16dcWCT8Hp6dJG+7tpNEVASHIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721899037; a=rsa-sha256; cv=none; b=Kr0Y2Rem2x3ILOHzfwBNUuhLIINFG6oQdo6KbciNAFtdlekGl9Jm8PY03lAHMTbM3RJnvZ hIdJhLgWGWyJE0XmJCM+VVgySwdhUlxz6YNL/aPuwgomtl/HgICi6EMwA2DZvfYWDIO4W6 yikBMZsNeM5O1FaB03lhmIHAdcW9ZmlpscZJma7zWlGePICDnIV4vR2kUGsofN4MpR43Mo j5mCUMTf7A9hdGOWNw4Gh0pvewEkGsgRoCMoZbViF38cHxH9RfBqL1m2vQCqL5WKfNHeEM FZ+69TYU/KurFSSyXlvd7AfIW5xfUaTqRp2gryanlDzXFZiqq86R1/0taOQrHg== 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=1721899037; 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=LWnE5kAnr/di0A1gwudzvftKt1Cb4PuCxmedeCw1KkU=; b=osZ8NRns9YyXW9qTNliQ8z2cA+gG2UwgNjFqhRmD5nZzibF844mr2duyTep9H5TvWzTzN3 ULVOs/UkMCGcOxi8WHSchLd4YlSs4Ojylu34/LXRJ+9eZcXMFuI99n5ufiE4ywvnXF82jI Sfud4wY6Pg4IOnpKtRQPtxl+Rd/F9NIodP/jibo4VtIEnZkpMY+WfYRjMlCVIvOCt5fDtm YtNpTPR/7RyVTQ9BemJwKaN3MS7Hob3gOuYyxCuOnd4eMUM6yggqMQOLLBvfiPZkUSTPPT LOCl8jITpWO5IJUPR9KlgP+5MTbm01dLvEPDlWwMSBHBTUM8Obv6oDMha30zmA== 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 4WV4z10ytxzpLG; Thu, 25 Jul 2024 09:17:17 +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 46P9HHNF089766; Thu, 25 Jul 2024 09:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46P9HHu3089763; Thu, 25 Jul 2024 09:17:17 GMT (envelope-from git) Date: Thu, 25 Jul 2024 09:17:17 GMT Message-Id: <202407250917.46P9HHu3089763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7aecd689e362 - main - nuageinit: Fix the homedir variable name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7aecd689e362330a035a199afbe5707a8c4edc9c Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7aecd689e362330a035a199afbe5707a8c4edc9c commit 7aecd689e362330a035a199afbe5707a8c4edc9c Author: Jose Luis Duran AuthorDate: 2024-07-23 19:54:54 +0000 Commit: Baptiste Daroussin CommitDate: 2024-07-25 09:15:29 +0000 nuageinit: Fix the homedir variable name cloud-init uses homedir, not home. --- 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)