From nobody Wed Jun 08 22:50:39 2022 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 AB34A83F62C; Wed, 8 Jun 2022 22:50:39 +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 4LJMrb4WBqz4Yhm; Wed, 8 Jun 2022 22:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654728639; 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=YmhR31BMmRHH+/pll7fhRmYRa74CKPNkv8yXh8vmlak=; b=Fs2bm7fI9s23montDSa/RtG09wZAlfoZgI0vMqLXH6JVQUP966qKdP3XTcsdA1yxj9/Pry NdRCvVoip/7DNoESi8bYMbCnxIkIX48qeS3TvdICVoNpj2rNs8lBsLrkD0jiOGhes208Yn AbugkclUqRRS4A/5ROIMkQDRqjRed8SQ96+swZIQ1RCj8v8RoDzCIs7RdkvBAY6SsrxS+q OIp4/mpZ21XCxtBkgtta5qWhjhKIYr4xeJTr1P257NqXaWkP8M1CdY92ERKrhBlFCYGXoF qBF4zibomqET4riatYXaqJNHrOKt6kiGaiC7gdsAoXo++YrgdujUPaym3BlHYQ== 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 7BC23189A2; Wed, 8 Jun 2022 22:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 258ModZH058897; Wed, 8 Jun 2022 22:50:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258Mod2w058896; Wed, 8 Jun 2022 22:50:39 GMT (envelope-from git) Date: Wed, 8 Jun 2022 22:50:39 GMT Message-Id: <202206082250.258Mod2w058896@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: 1d2e46d40861 - main - EC2: Enable ephemeral swap by default 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: owner-dev-commits-src-all@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: 1d2e46d40861aff2e4f3147e7a242e7bc808978e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654728639; 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=YmhR31BMmRHH+/pll7fhRmYRa74CKPNkv8yXh8vmlak=; b=HToNxof6TXtLYe7yNV9S1j2ja6JxZ17gCDogABNEBKt+kKCrs01khQ1LYQh42puZmxtcto pQCUJGQJOwl7HWid7+I341XbPMFa0+aZ9xE6ZibTrZsOlpQ2NUReEy/6eNA8Rse579TK0z 2XVPZiN4INmAdrO8uz0oviJpibFImNXpUh7VVPiVlVsyLICMqyJDaLcmWsM38N+OnLEGLY rZYKlegwLca6ZimHFTTgw8MHVl5hQODH1JAH1J79U8DRcA+yFyCvNL8gSe/kSIU/Xn/cxq yk//5o9VycDiuAvfsIrPDhat9+x3Ndw7dw5hHmNCid7h0MgkKnyDJRGIYpej/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654728639; a=rsa-sha256; cv=none; b=QKdV9jp73518On1Pgcye9qsaP9+Kssd0ZQOr8DjPobC7UpuOXi8eD9Tgk7EN1ixyCduI1r iGFw9WwrmsLr4hsA32cPfe01pDF/N47BoNSTbg7ovdbYn4Hg8mMbj5QJV0t3MJ+QzMq3t9 KWuXJTORjSKPUEPXdpORb8+obSSgc4xMnH1Zkxp6Yl3CYrJGoqrneE3JOPq07GjZqI8wn0 /ZQ23kWfxnEfYAFOvibFoRwj8Lgq1dDVozHVdHoIOVC9Q4STGtt1cby2ZhAgrEZkReKKg7 FQ/eAD9ceGmKXbrZ6AQo5uXsvVMZd8FcUdYY34JVFeZ6Es5hQUmbVCfZoEQrYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1d2e46d40861aff2e4f3147e7a242e7bc808978e commit 1d2e46d40861aff2e4f3147e7a242e7bc808978e Author: Colin Percival AuthorDate: 2022-06-08 22:45:41 +0000 Commit: Colin Percival CommitDate: 2022-06-08 22:50:30 +0000 EC2: Enable ephemeral swap by default The latest version of the ec2-scripts package includes a completely rewritten "use EC2 ephemeral disks for swap space" script. Now that we have something which works on recent versions of FreeBSD, turn it on since it's a great way to use the ephemeral disks. Note that the option for controlling this, ec2_ephemeral_swap_enable, is not the same as the option (ec2_ephemeralswap_enable) used with the previous ephemeral-swap script; this change was deliberate to avoid astonishment for users who upgraded their ec2-scripts package and had a setting left behind in rc.conf. --- release/tools/ec2.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 5be4937379a0..a61b711c24ce 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -19,7 +19,7 @@ if [ "${TARGET_ARCH}" = "amd64" ]; then fi # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd dev_aws_disk" +export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd dev_aws_disk ec2_ephemeral_swap" # Build with a 4.9 GB UFS partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. @@ -164,6 +164,11 @@ EOF # * firstboot_pkgs (install packages) touch ${DESTDIR}/firstboot + # Any EC2 ephemeral disks seen when the system first boots will + # be "new" disks; there is no "previous boot" when they might have + # been seen and used already. + touch ${DESTDIR}/var/db/ec2_ephemeral_diskseen + if ! [ -z "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi