From nobody Wed May 22 06:52:07 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 4Vkhn32DP8z5L2l7; Wed, 22 May 2024 06:52:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vkhn31fX4z4SQ3; Wed, 22 May 2024 06:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716360727; 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=4NYxT1FvcEp/SgFT4YYy6Ati8wjA36qsfocI3K4QXU4=; b=LHzQa0ce5LhsAqKhrckxnHUmkR0CuL0bqj9ggcj7wJgIl7hXpSWkkepjfD1QpGZcgzfuZK URGcVLWu2QdMb1mCbd3944BkXczX/q/9yKyoNM7hlp/aXvnUa3K6nc/klEHaBFjN7QF6a2 Zx81PAmoHGN7QZ/mUDc4GeFAFGvYrFQE5+RWwI4PmOBNQ3LjPQz5dQjrU2OZcIVL6KSepg dSlf8GvZkINAl8R7oFm3DMfvYWo0b6xHkljJTiAUk7FNIBzgKEeZbrjwCavub0WXBf3GHn 61TPvnrzj9r+SBMALPO9jIUdXNwpsS4mWq4Hi3lOMYXnHq6yUNGlsdKHcEvOkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716360727; a=rsa-sha256; cv=none; b=HAP7tx5lgK1dTykFF85y9HUZ3uNDbr1pmAAHPtCaVDcBMGMrOAP3wLnqfDkbBJKmFHhFjp fCTLVrluzY/5MzxUNB7TkqaLmZMExigcpkHKOpxK50YhS321HC4ibrHGEjRCfpstdIIdgf t+R79fZA/FxGeGs+D7r92hAF91MuKmzZReRPvNkwsnhZWrkHiD/hXtYfjI+yYIDNjOSfdP iAkMPkyUb+buir1nJYacTI5Wr2ZueSZKxk1I7E9uNhUrK8LnQLRgRIl5AjznaqcazG7YWB Kz1FLEKODtknLNjNkN/8U+A4P5z9eA4JF2M0nrCiZhZ8ZE1KEj1psmbHdIqouA== 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=1716360727; 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=4NYxT1FvcEp/SgFT4YYy6Ati8wjA36qsfocI3K4QXU4=; b=oCcux7OC94NdDPmIZcl8lHp7I/Vz0GxNxyCV6Ef1jbUcJQB+FOPMPBVo15oPYESJ658io3 v8yKyx3O/e3Riq8AdVFWhJr1sBYYMkJOCmZfT4O+8gH99+KzqFenydtc7/mlfUI7bgKHtO 4EE+4Ll7++PPRuWNvRs5ftdOQIP7PJqrYIeJ4jhZEJ9ZlATfi9IhHeBeX+aCyBOb0lG15V qPw5YecPZu6MtM8cRgOPdLoltB5ZYMJSBFZgxiALzzpFe+TfAYx6dgzTtLsT/QjbEhkkxp fI5Qm/maQ0PHYpa30obEemP23oO6icWNw/xYWQYvS7TmZ8ht820A+27OnXK68g== 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 4Vkhn31C5xzvp2; Wed, 22 May 2024 06:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44M6q7BI040352; Wed, 22 May 2024 06:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44M6q76w040349; Wed, 22 May 2024 06:52:07 GMT (envelope-from git) Date: Wed, 22 May 2024 06:52:07 GMT Message-Id: <202405220652.44M6q76w040349@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: 5601feb7204b - stable/14 - fix (nuageinit): SSH keys are not handled in metadata but in userdata 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: 5601feb7204b2ebb4c351b534105da8fc22213fd Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5601feb7204b2ebb4c351b534105da8fc22213fd commit 5601feb7204b2ebb4c351b534105da8fc22213fd Author: Jeremy Collin AuthorDate: 2024-05-21 14:52:23 +0000 Commit: Baptiste Daroussin CommitDate: 2024-05-22 06:51:33 +0000 fix (nuageinit): SSH keys are not handled in metadata but in userdata MFC After: 1 day (cherry picked from commit 48edad2edf6eb7a539e40dad8e1f87e3fa4973fd) --- libexec/nuageinit/nuageinit | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 08224061d1b1..df637bbc5064 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -164,13 +164,6 @@ if citype == "config-2" then nuage.err("nuageinit: error parsing config-2: meta_data.json: " .. err) end local obj = parser:get_object() - local sshkeys = obj["public_keys"] - if sshkeys then - local homedir = nuage.adduser(default_user) - for _,v in pairs(sshkeys) do - nuage.addsshkey(root .. homedir, v) - end - end nuage.sethostname(obj["hostname"]) -- network