From nobody Tue May 21 14:53:50 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 4VkHWL1tR3z5LX34; Tue, 21 May 2024 14:53:50 +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 4VkHWL1Q0lz4RMP; Tue, 21 May 2024 14:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716303230; 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=0rvw2aiOUYKBydkf4BKjxg5CwRXDnMKzUyX6t3SKdTA=; b=JVsfPBuN4eODBlkLb+C1tgoQ2mAE0KkJoNV9F2HrW6ZqOUHwqQTX2U0D7l83o5g2Or8JGJ tdzQv/TXuclFYmcP5ZU8Z9e4p5qxfJLWY3dE43gq63Szy6rGMoKICJ6dItAd/jQpzbGmkd dUjmjYRqegs/IHihXPu7Mc5SKSvu+nfLKahjoDKntfrjm7UZ6CIxWYMmzY2LF+Xy/1RcIW PhFodTCOVXOHk5E0jB0QmVtsiGZrSAXQMNsE7lJSAN/ZEpIisp5uMRrk1rm0T4Of4fPvhg iyG2cVejBt33FfKT8DdiRypyjAH3N4Dki8raA+9Hm0bxHb7bOFsMaR9qrlGQ6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716303230; a=rsa-sha256; cv=none; b=XbGL6kk9lWcO6by4SM8Rv1/QD5vIzRLIsFxg/Ra+/0/8R2VjzpRbnB/C+wUD7awnGZB2Km zjaLfkJQBH8nZoMuqNwYdMeTYnOjJXBIMpeXpFLe+HsJNaFZH5rHPK9U/Z/x6sfEbJWSIk ngUtSpwszvLpnGh029mSCSz+q4bOy6zaXbTs/++PjgYO/Rjw3XOfa34X3wNBTdsRnlACzf EyJGV9F22q4Q3wLMMUzjQhgNiOb5uVAywebP7oeLqGi2GJVdXXDElDCebDCeeBKByDvPfY SUYPyWSsh4f31Mk9BoTMTscaXGOFYzUOvStbCg6IWyNdiJpv0N7NXkr0DquKrw== 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=1716303230; 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=0rvw2aiOUYKBydkf4BKjxg5CwRXDnMKzUyX6t3SKdTA=; b=YODws0lQf+nTTggEE2qTphGkaEva0UaL6eSPJMbFbwGB6jyasKtLu/md9VLQ88xjILrXaJ fMT5/TpWKS2vWgh8DFQeeH69Lpt0BRm1tmzfmoRe3QA/pol+Ncg50uhSiftdfJn+zgHGdZ Ic2xHkYfDo7ryv1Kt4qSU755J6sDSiw7ninCmgdhbsmN9Wb/9Em2ksnRbaVaQcyrLsXnc9 5j/r+d4G+xNsuVmGUhjwWcTPmDYGt6n4/v0BrG27g6CGMZElj7bX+smB7NbaEVRJiujyHP lSH74ezKhkElP9zTmiilYfyzIohteaH/CeozxZvjz56vS2vs/kA8n3DJdSUJQA== 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 4VkHWL11r0zRFy; Tue, 21 May 2024 14:53:50 +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 44LEroXV017251; Tue, 21 May 2024 14:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LEroch017248; Tue, 21 May 2024 14:53:50 GMT (envelope-from git) Date: Tue, 21 May 2024 14:53:50 GMT Message-Id: <202405211453.44LEroch017248@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: 48edad2edf6e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 48edad2edf6eb7a539e40dad8e1f87e3fa4973fd Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=48edad2edf6eb7a539e40dad8e1f87e3fa4973fd commit 48edad2edf6eb7a539e40dad8e1f87e3fa4973fd Author: Jeremy Collin AuthorDate: 2024-05-21 14:52:23 +0000 Commit: Baptiste Daroussin CommitDate: 2024-05-21 14:52:42 +0000 fix (nuageinit): SSH keys are not handled in metadata but in userdata MFC After: 1 day --- 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