From nobody Wed Apr 17 05:43:57 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 4VK8wY5sxPz5Hv7F; Wed, 17 Apr 2024 05:43:57 +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 4VK8wY2Dzpz4lM8; Wed, 17 Apr 2024 05:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332637; 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=pt6mt6nq2tnarhmZpJ6N66Z6PZhdiJ1nUMyHroUsTT0=; b=KMVfdVUIj2jZBJYT9G2UGz9PezzkWbTja3e2QSj93KvnojhsY24JnOf8TP1RgtMCuhB33e +36eBJuM4cwWLTQ7khZVAjZiCnGAJOc23uJs4rsM5tGVKpTK9jH7v0y4q1nkSQUpn0Mpf5 mLqrS65jL7tISUEC9o2I50bBFtpMr6bPjbdCanwKI8Eu0lk5/4qtkie0zIf7hQyX5pWlg8 JvhlE6henVjpfyXBo4T5d3KCGYu5XzWejyaKGfk7nuGpSi4AT4n4kaIvF+W2jqBsnxpHm9 SoTVZ58SxldnknjotrodhE++TJQrs0bYIwvKPwGO+/I4UCKr9xh8KM9g1gowYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332637; a=rsa-sha256; cv=none; b=bRbbtBNxW6q6cHEkMIxhJ7CnuHXdgdehuF0ambKjrFAyVUMz2wSPORnbdZhBQek8yVyRAZ WNuudduJXeCBNJsUukUcR0VYeYikFXa7TzO0QRTScfiblB2yLri04LZa1o5xRnP17FyF+2 f5DwBEsj+diAyU98XGK1kd/DxuLUOjN4pDo73uoRui5ePxiCsEDpkPo0VaU00S5lRNJXm+ JOU+U3tWQJqhhZxnBYP8QtZ4B152BQzYUizTcxuVIBQ5G/+fTBuLgc7kwgSBCmt+XvmCw7 0hsx3qtzTzAf/5ODCdy+2dyrbiyqSAbCY4KDCR+Q9G4ijS6eLTQmL8bQxYy7ew== 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=1713332637; 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=pt6mt6nq2tnarhmZpJ6N66Z6PZhdiJ1nUMyHroUsTT0=; b=Y9NfvtbnIB1bf03ErY6B/wqpPpN4Kuv7FGZo+9dSVQpSP6upet13IDh19cv4NPRGoeewVo Ys4Zj/uv8mbjhLRis3DypfvsyhBozE7aN6MmheiZUR4hI3OzC5foz2Dhe0pJ+XDB6csMC4 lZgzHqUDrv15611c7THgruY9qPR7wViOkdcayJDSE/uox6vTjA5CoUtpxLVDGvGySVC43h Kwqi/VKgR33p5zepNkdKlZAiY+h/i4xUHD/BMVIEFjLMLC437XXWu7Lirb2+OcmKS68a4I JfD9kQgO14XyREuY2NhlDVgJPeeh8Zo4o7NYFzDDGCaq5658LztCjLbtrL3N8Q== 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 4VK8wY1q7WzF05; Wed, 17 Apr 2024 05:43:57 +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 43H5hvjR006802; Wed, 17 Apr 2024 05:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hvmr006799; Wed, 17 Apr 2024 05:43:57 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:57 GMT Message-Id: <202404170543.43H5hvmr006799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2bd006237fbe - stable/14 - ec2: homedir bug fixed in 24.1.4 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2bd006237fbef7cb4ba1c70c89431ab3e2fd4fbd Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd006237fbef7cb4ba1c70c89431ab3e2fd4fbd commit 2bd006237fbef7cb4ba1c70c89431ab3e2fd4fbd Author: Mina Galić AuthorDate: 2024-04-11 20:16:58 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +0000 ec2: homedir bug fixed in 24.1.4 This bug fix is due to be released in Quarterly: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275896 While here, overwrite the `doas` stanza, which needs to correspond to the user that we are creating. MFC after: 5 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1163 (cherry picked from commit 2039437c7655c9cd481c6c4ad92b6bc2a945dd14) --- release/tools/ec2-cloud-init.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2dd4df390fa3..7682d635b1d6 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -23,8 +23,9 @@ vm_extra_pre_umount() { lock_passwd: True groups: [wheel] shell: /bin/sh - # Currently broken, cloud-init hard-codes to /usr/home/* homedir: /home/ec2-user + doas: + - permit nopass ec2-user EOF return 0