diff options
author | Colin Percival <cperciva@FreeBSD.org> | 2023-09-09 00:55:16 +0000 |
---|---|---|
committer | Colin Percival <cperciva@FreeBSD.org> | 2023-09-28 22:18:46 +0000 |
commit | 1f4ce7a39f0f4b0621ff55d228014ccddb366d37 (patch) | |
tree | aad56a73f7f5ddabdef8c721e46f797bdda32994 /release | |
parent | fada6e2389fb62ff621a98fab7319e426da58b0b (diff) | |
download | src-1f4ce7a39f0f4b0621ff55d228014ccddb366d37.tar.gz src-1f4ce7a39f0f4b0621ff55d228014ccddb366d37.zip |
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile.vm | 5 | ||||
-rw-r--r-- | release/tools/ec2-cloud-init.conf | 31 |
2 files changed, 34 insertions, 2 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm index 679ac74f438c..1a58a548b9f4 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -30,8 +30,9 @@ BASIC-CI_FSLIST= ufs BASIC-CI_DESC= Image for CI EC2_FORMAT= raw EC2_FSLIST= ufs zfs -EC2_DESC= Amazon EC2 image -EC2_FLAVOURS= BASE +EC2_FLAVOURS= BASE CLOUD-INIT +EC2-BASE_DESC= Amazon EC2 image +EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image GCE_FORMAT= raw GCE_FSLIST= ufs zfs GCE_DESC= Google Compute Engine image diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf new file mode 100644 index 000000000000..2dd4df390fa3 --- /dev/null +++ b/release/tools/ec2-cloud-init.conf @@ -0,0 +1,31 @@ +#!/bin/sh + +. ${WORLDDIR}/release/tools/ec2.conf + +# Packages to install into the image we're creating. In addition to packages +# present on all EC2 AMIs, we install cloud-init. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} net/cloud-init" + +# Services to enable in rc.conf(5). +export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" + +vm_extra_pre_umount() { + # Configuration common to all EC2 AMIs + ec2_common + + # Configure cloud-init + cat <<-'EOF' > ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_ec2.cfg + disable_root: true + system_info: + distro: freebsd + default_user: + name: ec2-user + lock_passwd: True + groups: [wheel] + shell: /bin/sh + # Currently broken, cloud-init hard-codes to /usr/home/* + homedir: /home/ec2-user + EOF + + return 0 +} |