From owner-svn-src-releng@freebsd.org Sat May 30 18:01:54 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0617D2F13C9; Sat, 30 May 2020 18:01:54 +0000 (UTC) (envelope-from cperciva@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Z8QT6TJjz4N7R; Sat, 30 May 2020 18:01:53 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D99F6CF47; Sat, 30 May 2020 18:01:53 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04UI1rdn048712; Sat, 30 May 2020 18:01:53 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04UI1rBt048711; Sat, 30 May 2020 18:01:53 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <202005301801.04UI1rBt048711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 30 May 2020 18:01:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361653 - releng/11.4/release/tools X-SVN-Group: releng X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: releng/11.4/release/tools X-SVN-Commit-Revision: 361653 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2020 18:01:54 -0000 Author: cperciva Date: Sat May 30 18:01:53 2020 New Revision: 361653 URL: https://svnweb.freebsd.org/changeset/base/361653 Log: Insta-merge r361652 from stable/11: Expand EC2 AMI UFS partition to 2.9 GB. Approved by: re (gjb) Sponsored by: https://www.patreon.com/cperciva Modified: releng/11.4/release/tools/ec2.conf Directory Properties: releng/11.4/ (props changed) Modified: releng/11.4/release/tools/ec2.conf ============================================================================== --- releng/11.4/release/tools/ec2.conf Sat May 30 17:43:10 2020 (r361652) +++ releng/11.4/release/tools/ec2.conf Sat May 30 18:01:53 2020 (r361653) @@ -19,12 +19,12 @@ fi # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd" -# Build with a 2 GB UFS partition; the growfs rc.d script will expand +# Build with a 2.9 GB UFS partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. # Note that if this is set to G, we will end up with an GB disk # image since VMSIZE is the size of the UFS partition, not the disk which # it resides within. -export VMSIZE=2048M +export VMSIZE=2970M # No swap space; the ec2_ephemeralswap rc.d script will allocate swap # space on EC2 ephemeral disks. (If they exist -- the T2 low-cost instances