From nobody Mon Aug 7 16:21:40 2023 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 4RKM5d0MVbz4TqpD; Mon, 7 Aug 2023 16:21:41 +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 4RKM5c7306z4cbd; Mon, 7 Aug 2023 16:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691425301; 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=b6AfodNmodYnaRvKIthElNjCxPLQo5395y7iI7mtY3w=; b=CZUrhU5N0SghmwTBLvKPdGUl64mcPjelKfNLn+IMzXm4zo+Jo4YUVplilhryI1eeNwASpH fpNwPmf7Q5EjCmfs45Vii+e6rYnYVbNbcWSAgpMhWxT1dTD8ED0peK1OQh+HJWXCmOlCNL +z7xlDbXyhsPpCqYIBFhrbmblsJdbge70KrbpCVRmtQ0QuZeCu6NbXZgXADUDQlYejlj4q XLOtL7CsdhhluzCgAW4LYE2psVlSWMd7uxHajR7lR79ljkNrKzjJXJjhj2UDDIpwHWQAX+ 2lybdNxpnrPxPUcugMhuaIeai1o/fpXBFnlZ1LCJMtcKCRGa+i/E2DNZdQ3brA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691425301; 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=b6AfodNmodYnaRvKIthElNjCxPLQo5395y7iI7mtY3w=; b=hq6qdDOLpJyqFo9PgxEu/b91Wll5f07CXCI7j312xSxJVvPKQm/1c2xKfb1qyaspiATlNO 36iBXsPiQ15SgJXBYKUV7b+UwO/1ZfH/tDp1owa/zm7GrsX6oGnSkGRhIPOKpf7u7pbHfZ 23gI+QWuGpt2zFEZG4S0ohiJAAK9FJxcDBstg2kOwFcf08qjhgv35ISRRDwRotlp8XLWZd oLB39NattVxE286VxSbTdQe0yhBX7vUGILXwzW/27IJMpuwEK/mEBsfey9k1GmegXl4MAi fHb0JuGhuO8wB40MW++fkOMh7KebqZzF4u8wOPn0O1o6kb9A22UI9g3jqrG0gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691425301; a=rsa-sha256; cv=none; b=iiwCftOlLH17B28UpXBtt2pvOJGZXFgmI+cn3hVK9tLE+60yzgNj5+Tye5Yt0i4iKpfRg5 WPoIu2YszazllNtQEj+J/Tjn2cDsDvIyZUDvYNbzqu9OizCPvoCG1Y3oqfU4f0qn4U065R FeGHYJh2CV4Hf6PgProfh0siOd4jN7yBxE3gKEaY5scauFjkpa6Eaw5AwvcJMzuwWi7AxP ozzJU1NVIXbS8XkDBBNyqyyaWC4S/i+Uz8lsW//TEyLk8+2YOPgrFtU29SzCmR6IhWP6wY cGNDzD3v4J1Q7vtVu7/RC5ykM1PxX1IBIQGGLRx0mnYBRKTFcHZS1aPlmZ2WvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKM5c68M4zym3; Mon, 7 Aug 2023 16:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377GLeMA023123; Mon, 7 Aug 2023 16:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377GLePP023122; Mon, 7 Aug 2023 16:21:40 GMT (envelope-from git) Date: Mon, 7 Aug 2023 16:21:40 GMT Message-Id: <202308071621.377GLePP023122@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: ac4f03e03e6d - main - Firecracker: Make root disk configurable 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ac4f03e03e6d94ac46fed7c4f7801b522d290423 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4f03e03e6d94ac46fed7c4f7801b522d290423 commit ac4f03e03e6d94ac46fed7c4f7801b522d290423 Author: Colin Percival AuthorDate: 2023-07-14 22:11:22 +0000 Commit: Colin Percival CommitDate: 2023-08-07 16:21:08 +0000 Firecracker: Make root disk configurable Add a FCROOTFSSZ variable which defaults to "1g" which controls the size of the Firecracker root filesystem; it can be set as low as "300m" at present. Allow WITHOUTS to be overridden if users want to build a root disk with more -- or fewer -- parts of the FreeBSD base system. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41041 --- release/Makefile.firecracker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile.firecracker b/release/Makefile.firecracker index bb54db7da5db..dc5506f364d2 100644 --- a/release/Makefile.firecracker +++ b/release/Makefile.firecracker @@ -17,7 +17,7 @@ WITHOUT_FC_ENOENT=WITHOUT_ACPI=YES WITHOUT_BOOT=YES WITHOUT_BHYVE=YES \ WITHOUT_FC_FEATURES=WITHOUT_DEBUG_FILES=YES WITHOUT_INCLUDES=YES \ WITHOUT_INSTALLLIB=YES WITHOUT_TESTS=YES WITHOUT_TOOLCHAIN=YES # All the excluded bits -WITHOUTS=${WITHOUT_VM_ENOENT} ${WITHOUT_FC_ENOENT} ${WITHOUT_FC_FEATURES} +WITHOUTS?=${WITHOUT_VM_ENOENT} ${WITHOUT_FC_ENOENT} ${WITHOUT_FC_FEATURES} firecracker: firecracker-freebsd-kern.bin firecracker-freebsd-rootfs.bin @@ -35,6 +35,7 @@ firecracker-freebsd-kern.bin: cp ${FCKDIR}/boot/kernel/kernel ${DESTDIR}/freebsd-kern.bin FCWDIR= ${.OBJDIR}/${TARGET}/firecracker-world +FCROOTFSSZ?= 1g firecracker-freebsd-rootfs.bin: mkdir -p ${FCWDIR} ${MAKE} -C ${WORLDDIR} DESTDIR=${FCWDIR} \ @@ -54,5 +55,5 @@ firecracker-freebsd-rootfs.bin: -u 1001 -g 1001 -G 0 -c "FreeBSD User" -d /home/freebsd -s /bin/sh pw -R ${FCWDIR} usermod root -w yes touch ${FCWDIR}/firstboot - makefs -s 1g -o label=rootfs -o version=2 -o softupdates=1 \ + makefs -s ${FCROOTFSSZ} -o label=rootfs -o version=2 -o softupdates=1 \ ${DESTDIR}/freebsd-rootfs.bin ${FCWDIR}