From nobody Thu May 23 07:51:06 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 4VlL2g15Cbz5L7fp; Thu, 23 May 2024 07:51: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 4VlL2f6CV0z4dLD; Thu, 23 May 2024 07:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716450666; 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=JKiRoWaqoX8BQwGctmx0asnJF7CpD9GO+VhxtTyTn7A=; b=j84H93ZIktQcV0KYwspKzdPbEkpOdSvY1208I6XFa5r7ov2yJEPuWiLEY/xoaHOAqqmkG4 dRWvFSJJI1RjijofU4FaeSNCCgG5ZpNNP5TdkZ42iuE3/Qi7MXESpOmDBcZvHzv1MxXBmq E6fFro+t4bGsJF5NOhFr5G6HLhwd0lReww5qpyyMYo1gHNodsnl5urbr4UM19Gc1NIAH8h FjCI+stRiKATuOJBr/PMu9TZr/R0u/Hj/2XKKM851YXwUp36vjbVV4sgV5K7HOxUlUAIQL f7zOmivnmUPNhkBrzFT+AYhCTO2CL0NjWGoTGVXob2ry1smfo7MzhqnxMX/0cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716450666; a=rsa-sha256; cv=none; b=qZ+XTySFqYcqNkIJfQx5ZjKMx5etRV9WpBifdz9AyRSU4hJss45z2nzZFxUN7MmawK3dNw dqjy42n1IdWm7Cqsr1qRNpMU0zzQ919BLO2TuXso/dLoKOzFla7z/B0aksbSxwYc87HpkS KOoNcBMdFe/fAoUA9whMRzUChavjG7yYEcwP7kvj9Aq6WVla4wWLJ8l7c7EeLGukIkfQfs xYDY7OqeUoHiMJRMReXuE/Ih3SyJ/YR7EEu+wOJyBPFVw3P9OGdHpq8Sz0h898rjQ1jUlX XS9GCWpLCffYnDC4hi/lN9mOPf6Elta9ZhgxvPq03CsiUbQnMu/owA1y6Ve/oA== 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=1716450666; 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=JKiRoWaqoX8BQwGctmx0asnJF7CpD9GO+VhxtTyTn7A=; b=Az+rPsI1kD7+5H+bPeLQShhHdt4wBt/gy6u/o3sEtWsJOrTdawAbTGuFMubDqKgbo634AX 1trRTBlqv60tSye5Qp23dautGBgwX0dFYO+HuHO6x7i43TgIm1xh2UF40tf12LFCu1J12z 3ZRh2Se+OhxzbjuxqZlwK8g6ceeQP3/q/yNVr5XgvIoURauy+N/wAlHPXY0nuAHcdzogY4 Q8O1CD9PwPkI6a0HL9tZ4YtcZ2FhLBC26vZrKDAgA0jDaj2i2Qw61y8BhO4IhAWQlLNnmR 036PDQ3HfoHfjj+qSabQ9z1cnBX//m4H6xE553X/Uy+ydDz0OSHNXRKpp0525g== 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 4VlL2f5f5NzgwC; Thu, 23 May 2024 07:51:06 +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 44N7p6gu080935; Thu, 23 May 2024 07:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N7p6ID080932; Thu, 23 May 2024 07:51:06 GMT (envelope-from git) Date: Thu, 23 May 2024 07:51:06 GMT Message-Id: <202405230751.44N7p6ID080932@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: 3b9c88fa9916 - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 3b9c88fa991649be79bc84b131266b20d432b11a Auto-Submitted: auto-generated The branch releng/14.1 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9c88fa991649be79bc84b131266b20d432b11a commit 3b9c88fa991649be79bc84b131266b20d432b11a Author: Jeremy Collin AuthorDate: 2024-05-21 14:52:23 +0000 Commit: Baptiste Daroussin CommitDate: 2024-05-23 07:50:01 +0000 fix (nuageinit): SSH keys are not handled in metadata but in userdata MFC After: 1 day Approved by: re (cperciva) (cherry picked from commit 48edad2edf6eb7a539e40dad8e1f87e3fa4973fd) (cherry picked from commit 5601feb7204b2ebb4c351b534105da8fc22213fd) --- 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