From nobody Thu Apr 11 21:12:42 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 4VFspy34QVz5G72d; Thu, 11 Apr 2024 21:12:42 +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 4VFspy2ZgNz4vZR; Thu, 11 Apr 2024 21:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712869962; 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=0zxM463ACq9RgaB61egWSSszxRXI12RBlMSWSi/hYCA=; b=vaXJTg2ukIW/D5Dvg0OoOI3wPNXZ3ywKvd26PHDTvdn8h3uolvB5hf+eugYN6QqzxH9nbM iz9S4oQeSU2OTDchdEO8uhzMRGXCWWBpq20p9C3AFNuHJJpzGOLFvtgbRiMBjS+nqfQYkv NOh0NVYLph0ry7zPmR2NLx9XgCTokQ5bw7rZhtWjrYK7/3GLMjSZ44UvWEE08Y94/T/DXf W8beremfqnAof25b9FOWUkhiIOUI16WeopS2JpTIe3NB3XzVGSatd9EVFdvIVhmZ7s7k5G eRLZpevF/js4+GQ8YXI8wEThCx7XbVJ0eAfvcg+2uXUa6XmeFYfSpIekg3YZ1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712869962; a=rsa-sha256; cv=none; b=CnOf3Ba6VwqEyDiUO0yWC0faHZbyxQ2V60S5fJQyrq46fXQRaqyIfq6gx1WPUolFFqJ2He QxkXbmfBi2kYa+2HdoB6VwS52QshZpyHcKnXtLroEFgGBI2tS1LZBGa8u9To/5cLZgZngj Em89ebKRuAJTaOcCgMEKnkyubbG574/lRee92fnHFAWltIO4ld4PWzGG14aoNkOlXfePpI I8swsyc8h5rTvAbmbO/ot2Jcn4q+BMQiKYej2UZ39ANOS+vu7Np9UxAXBxQEeevPXjTQkk VohwLbn48bwKmuAH/cWYP5KgPWBjEtgjhaOBt10jHeKe6pSFcX6Sx5Q4/kv/lQ== 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=1712869962; 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=0zxM463ACq9RgaB61egWSSszxRXI12RBlMSWSi/hYCA=; b=N2lhuJ4UVyMqfjgR1+OwhRDpGsOfYPUkCqVZKOA3xho0UlZ8BAXiy1zka8mspMD6tK7j8h s3e4VndKuyxp9fqR+F5XJCvq3eHojVvxipSAXQkHp6wCDypk9eXjQ+Qrr29AyGCdue8H3p LiMMV4UIdjmjtVv8dImTwnc3sWHAf5dEmS/P7H2+fQAVNdOvwUEowjmqEb2XQLoS+WwHw3 FWlcYJMSOQQDokCOG0erI287Z49qt3TtRrMmYO7FVd0WFtxGqD8hRON/17cvgorAgiW9gg 0czx5usCXIHvbbNrIK40NC8HIGHVxPsGNi7E7D4IVuP/cQGSq75WeIKIExYx6Q== 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 4VFspy28C0zM9n; Thu, 11 Apr 2024 21:12:42 +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 43BLCgYq043953; Thu, 11 Apr 2024 21:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BLCg0N043950; Thu, 11 Apr 2024 21:12:42 GMT (envelope-from git) Date: Thu, 11 Apr 2024 21:12:42 GMT Message-Id: <202404112112.43BLCg0N043950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2039437c7655 - main - 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: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 2039437c7655c9cd481c6c4ad92b6bc2a945dd14 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2039437c7655c9cd481c6c4ad92b6bc2a945dd14 commit 2039437c7655c9cd481c6c4ad92b6bc2a945dd14 Author: Mina Galić AuthorDate: 2024-04-11 20:16:58 +0000 Commit: Colin Percival CommitDate: 2024-04-11 21:12:16 +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 --- 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