From nobody Wed Sep 11 05:29:33 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 4X3Tf61TcYz5WD7R; Wed, 11 Sep 2024 05:29:34 +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 4X3Tf60VKMz4mbf; Wed, 11 Sep 2024 05:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726032574; 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=YhZdUmAqHIN4NUz3tyRxzp0l2SViDpc+T2eMabvuTlY=; b=YS9tpbNT7uiRZFHTZw6OcINdR0MGfhMLAQBSJXFziRqfkFZLEm9fTnxn/x6JSHz7SxLxb+ 5nSM/cakCfUMFtj+BHvvKK9/s+xTdNaZSiQmkgQQXZldjMNGtmA5mAiWTomemanJWGiOn5 atM0BJtENqNUwa3JmsOfqJU+ia1Bs1pMWuJhNhtB9EC90ov2Omy652JJ+h3NeS1Isp91y1 dTqSsnEymdsyxY5IxOs2yJYx1O8ANp982cj8862SNzaxu11GcCAUGZKke3gxAOgIH49t9G lgFCMXnfDEIRPkTzLiOaWlzoAUjUQF33j6zzupQOP25THKT8Ph5EwQVzIgn2sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726032574; a=rsa-sha256; cv=none; b=I1otAEYk+Ngb2x3mlABFRDbC18Oj5pwaRqdRcHA8TlfqL5Wit0SutGxcUJDlf5nRgUN+5/ 4ZRdHqMVr87zYgGHhiEqs9JaWFONfuvc9T0ValgziNOISbYXpKCFuz+6yoXZrokd39hPcX 9GMUGa1BqvbdGaGh1DvKeECd63ZIc0dZHnVlaNkQYECiYH9s2ab4Y9vrRizS3gKJGWBCfl 35u3ayU+ail+lHgKzke6Ptxeie8CxBYAU+SPyE79JnOmq5SYeGDGISUWc2CmnA5rultUo+ ayG17rsAIBC8+l3MdawXcPMr+WREDZ6Nkd20PyEFjRh11dHhhV8IGaXiuELwhg== 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=1726032574; 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=YhZdUmAqHIN4NUz3tyRxzp0l2SViDpc+T2eMabvuTlY=; b=tXZ37zM3WjqaPKMMJ1Ng1jk6dr9R9R6/iwJhpRQV46YZKo5W835qvGeo2z4AKeqP7KIKdT YWt1a/66anY5pqZY0YLbNhmAk8mfZFh+Relkptm5go+wv61j0Qn18MvFzu0tptHlnkXwqc Ej0oQZuFzEBC8OmHNSoOgScKv0YySwwGgUAFp7fyPS4113Tb57DwYxgF6hwTTuxX24Lf2e fyUmfLKfLH+I6Wz/WmIgpr7Wjyrl0zOpUTK7oVXRHzXOxNl7cUwsPw5TgSkmqVDx77/m6T 88tklgNoVCUkYhlfvLrNAhtzHMVhAUthKqqzCiIdsgTFUI65d7Aa4KCdXtdO7Q== 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 4X3Tf606WyzJJd; Wed, 11 Sep 2024 05:29:34 +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 48B5TXNV065179; Wed, 11 Sep 2024 05:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B5TX5J065176; Wed, 11 Sep 2024 05:29:33 GMT (envelope-from git) Date: Wed, 11 Sep 2024 05:29:33 GMT Message-Id: <202409110529.48B5TX5J065176@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: 6a9e7f6a1d35 - stable/14 - EC2: Make amazon-ssm-agent optional 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: 6a9e7f6a1d35e7b7385aa4ae1bbfb65cf8ea0c65 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6a9e7f6a1d35e7b7385aa4ae1bbfb65cf8ea0c65 commit 6a9e7f6a1d35e7b7385aa4ae1bbfb65cf8ea0c65 Author: Colin Percival AuthorDate: 2024-08-31 23:50:16 +0000 Commit: Colin Percival CommitDate: 2024-09-11 05:28:59 +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 (cherry picked from commit 40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4) --- 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"