From nobody Thu Jun 27 08:57:44 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 4W8ssN6B0vz5PG3S; Thu, 27 Jun 2024 08:57:44 +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 4W8ssN5cf8z4W3d; Thu, 27 Jun 2024 08:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478664; 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=yti766KZtYjbb/t6jL0i+2VFyjS1xxzPzqVtOzZVX7k=; b=qA67CPY6xCMYf9suTBR6cuOWcV6PvqAjcmKsbCYjcwCHoRx3Y0DmfgLeDk/BwNyVAO0Qb9 jkkd0H1Pa3XnVoSrAUko7bP2WIjlDKW0vzNkwvd73oY0dyXNF7GeFh4hx4Lzgqu/G6jSDo /2gQCvMs0UZjUxLXb0xivl6i3O2voYqv7JqOpcgCoemfCmZUX69J57xoQ2Bl+J3i3DiybL UefBnxdaLA9itk0eznayf/mvJCoXf2JMlhTrgDRpFII80T6UnMoQ8saFcXwwED0WmcYRjS PnR3H96qmGgsbF8eG1rlUM/wQOlHbWJAF/T7HR5YCVFaP9mLgJwfbb7LrqLb4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478664; a=rsa-sha256; cv=none; b=o8XHAluk5QC1KHTRu+anxctBrn6ZPD/WH6xALmpC3S7cxduskLpeeDaN3aVedWbITnjABt hdVxM3JNYJ1a0GUfHjSwqiNkn940QplNQo8yFBZ58OryTqb9j+M6RDrhwXL5xr/ZHX+Bny NxMkwW6Jr0oNZ6qdfVxB9dsyxYHXyEGuNp1pcrMLimPdf1JuARZxjEjBdxjqxJXAlcY0hG qq+m/dPlEt4cKsGKe1IqCDtlv+4Nj31P+e0wF9nrSKNL7jCteLOkEP6p7Xjd67uY/U1Mum q7fMPcJDnEaPPv87pujzdzXtDHDizjwomW+Fge/6Wuj96OeswkcDGD1FXRFZWw== 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=1719478664; 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=yti766KZtYjbb/t6jL0i+2VFyjS1xxzPzqVtOzZVX7k=; b=kvwXg1Q7UeiDxIuS/HhlQabeTC6/FYZheTkQWf6nQUEYvFOiFcQJvarWCXwRiEwTB4dVsx twygmMsxqcN+AUmy/OEmHQqPs/Wftx5oK9eQxdmdaeEZ3R1Wl5S3aguSNtNcEmzmzgvIFf kUI1x4Xt4TTRCq4hPn/SVrQXJ1RVNz/3k74ibCHqat0cz3ovGCX+k6ad/4soB7quQ7bFZc Mo1m6TeXtqzf022w1Ts47wHN5qZRMSh+qXpJRMpNqYuMMbTiaYdWvpBFaqWgio0K31jmWx uK+shjS0nrqEfgC65xNK46ikJTZA+ZQp8NAXHY0E8ksVfwBm5ZnEhhRa4JPjwg== 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 4W8ssN4w3yz1L5n; Thu, 27 Jun 2024 08:57:44 +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 45R8viSY010531; Thu, 27 Jun 2024 08:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8viTo010528; Thu, 27 Jun 2024 08:57:44 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:57:44 GMT Message-Id: <202406270857.45R8viTo010528@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: 3cfc085f8ac9 - stable/14 - nuageinit: make addsshkey friendly for testsuite 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: 3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 commit 3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:44:17 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:55:07 +0000 nuageinit: make addsshkey friendly for testsuite (cherry picked from commit fa07b02f6e09f776b3afe5709e8fee1764c11a2a) --- libexec/nuageinit/nuage.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 020b54b0776c..ca70c778791b 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -177,6 +177,10 @@ end local function addsshkey(homedir, key) local chownak = false local chowndotssh = false + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if root then + homedir = root .. "/" .. homedir + end local ak_path = homedir .. "/.ssh/authorized_keys" local dotssh_path = homedir .. "/.ssh" local dirattrs = lfs.attributes(ak_path)