From nobody Wed Sep 04 05:57:19 2024 X-Original-To: dev-commits-src-main@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 4WzBbM3ls0z5VBM2; Wed, 04 Sep 2024 05:57:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzBbM201Nz43Rk; Wed, 4 Sep 2024 05:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725429439; 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=Pj16YpnrDkwhhNrTe/xmLNgTx7JapGidX1dl1KGv71w=; b=G003fYVQ0H4YTTUUVHUMUxGUNBw1Hr2QO6JpvLc8bi/m9pp2kQRVlJwDTe+P//5HKQLK5j s34LVvuJqqROn9pvy5ddOw//RGGedQ94M0lGRjhyQgD60BOSHbpwmTPLwFFzoiYvl4R8By lmgfxRtySX6WKJ/3XWes43RyS1QwAa3ntg+9oJ0USNEiv6VaPTO+W1LHobEoTMlDa+SEVQ hewNj2/Kb/+GlQ5LkXvKZFs57wrzCeVhbAi8Kn+if+ImkCDwYHZlgiKkky07HqcqtDyoJU /+PPrO6FS0ygPYECjXv2UnSFGf0tI3SKA06qjUIGFuz4tQAEzWU9Ve8ZL90Zng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429439; a=rsa-sha256; cv=none; b=EteWEjg7BykXk3XI3nIfXlHjuoZk7xqjh4wughS9Pes82rNrrYcUja5vtHxHdVTlF0uPNA t+59SPyFq7Hu4uCKm8j1YmnfHiYbV1+ctPSugq83M8FjgwiD1eIndHlzeOWtYghstyDMyk 6FKpy0WpZsndkMpkA01l8GHohp6RIzWnHPj2BTFYTqS0uRaZWWI1EIqm/SAr+sgnNs4wT1 dA/JG13G6hSR59IYjo520V1tZvBbuWNfLnawKiHxJtcdY69+DPPG40Xj7X+DWRIHR1uwhq CUmJUtcr/iyiWamyKOie8a9s9eT0IXpp096x13e5aG9EN8NKV2KxaYK0AULLVg== 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=1725429439; 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=Pj16YpnrDkwhhNrTe/xmLNgTx7JapGidX1dl1KGv71w=; b=F0OwT30fpFP9a2nrTA6x+WW2pxA9TdXwOur1UFtMhfNn8YgcbEFY//3B6fTwGzq7e1wccF Cq1iLNVaK7Ow4c/H6Mkhv4lnTLf9vYiSu8aYU4ElQ1m/xMLHSAl5lXyED3Ecxhyj/9XHvR BvkInFY6Fwxc9Y1Hk585FG7zyhGM3xuTp4fAvhPTfuh2wvfHSp+NT+7pH3riXd4tSyFCV7 KuIFil1wwyaoPj9SgpKyteqzCfMfoXX07IH3X9kEk0gDeCFWBKUxHD2yIXwMt3xCD01ol1 LStNdEZ+6lkl6V4L8rjYUkzF3JVBrMM800lSe7tvPiPjCBwhmH36le5dyj9T5g== 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 4WzBbM1YBcz1BgY; Wed, 4 Sep 2024 05:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4845vJch099379; Wed, 4 Sep 2024 05:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vJtf099376; Wed, 4 Sep 2024 05:57:19 GMT (envelope-from git) Date: Wed, 4 Sep 2024 05:57:19 GMT Message-Id: <202409040557.4845vJtf099376@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: 40ff0753abb9 - main - EC2: Make amazon-ssm-agent optional List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4 commit 40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4 Author: Colin Percival AuthorDate: 2024-08-31 23:50:16 +0000 Commit: Colin Percival CommitDate: 2024-09-04 05:57:06 +0000 EC2: Make amazon-ssm-agent optional Move it from VM_EXTRA_PACKAGES in ec2.conf to VM_EXTRA_PACKAGES in ec2-{base,cloud-init}.conf Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D46508 --- release/tools/ec2-base.conf | 4 +++- release/tools/ec2-cloud-init.conf | 4 ++-- release/tools/ec2.conf | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index bd2c510cd1a7..3ed20474a4e8 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -4,11 +4,13 @@ # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: +# * amazon-ssm-agent (not enabled by default, but some users need to use +# it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, # * firstboot-freebsd-update, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 7682d635b1d6..048202e252f6 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -3,8 +3,8 @@ . ${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" +# present on all EC2 AMIs, we install amazon-ssm-agent and cloud-init. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 09cf1ce0017f..2cca5fa713af 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -1,11 +1,9 @@ #!/bin/sh -# Packages which should be installed onto all EC2 AMIs: +# Package which should be installed onto all EC2 AMIs: # * ebsnvme-id, which is very minimal and provides important EBS-specific # functionality, -# * amazon-ssm-agent (not enabled by default, but some users need to use -# it on systems not connected to the internet). -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id amazon-ssm-agent" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id" # Services which should be enabled by default in rc.conf(5). export VM_RC_LIST="dev_aws_disk ntpd"