git: 2039437c7655 - main - ec2: homedir bug fixed in 24.1.4

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=2039437c7655c9cd481c6c4ad92b6bc2a945dd14

commit 2039437c7655c9cd481c6c4ad92b6bc2a945dd14
Author:     Mina Galić <freebsd@igalic.co>
AuthorDate: 2024-04-11 20:16:58 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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