From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 1D58890588; Mon, 10 Oct 2022 23:33:01 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 9C8629029E; Mon, 10 Oct 2022 23:32:35 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id D870E9007B for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 3B89F5C01BD for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444730; x=1665531130; bh=s7 RWb98TYDPIxgO+SbHDmvitANheqFIHwFAC7x0bNlo=; b=Xp1Mb/6yw84Roh9YM2 Sf+wExXZbPkE+kTfoGghAJzY4pWSYLHfsqLH9tWLI9Yj1xPz9eLWmH1HeEXEvRoQ qbZrTciEG9xSnF8wVsk71UMleLRQ4tyhRw15+EolpE5zJApvmorAHdS4xe3IkCdt cul9BRsYJ6CA+NxVbLo0FPq6pViy6ChjYrIbSPkPVrsOrDqOwai6jf8Is5UeidNF gir4Nv3bv3Be5p7PgoAFu+L1JAxuaqLoiYwRS/E1jbGXd0nIJ/TCjhSysWmAmUR/ 06G7auZtyTiVW2T6m71Z3QIhMVq0pp2k7+VMIOX93H4jKWv9WrTLwSEtuyRpk+H7 Clsg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444730; x=1665531130; bh=s7RWb98TYDPIx gO+SbHDmvitANheqFIHwFAC7x0bNlo=; b=F2htk5t35RE7r5sdDBDkpZUu5TEbE ZL1R2BE/KUlW4tTMqje+Hbo9fiQ+IZ6ABYcBsnS5DEOyWizPOFRHYCr+Gv1Vp0yU FXMbe3QhHwVyNf9zT6ZcQ637JAKmHF1Rkt7yRcPBQSBCypKtbVE4pWoNkQDcdDO2 4HwzBxn21ZzlZlJu/S0omD7FP5Lm7fzyNl+geAPZMU40SYayEu3vWc+NKMT+XWJy oeiFqQ+IXW59TCJBOvrA7447JhN5yfQnwnRdboikvmGJCQ/kb8C8/N1tyYIW/hQ9 Njox2jkQUlZwYd07uJJkWZAwb6T0iWnesnFPwxoTCQpg+mGdtosD66OrQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 95C13BBD; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 12/22] host/rootfs: automatically grow user partition Date: Mon, 10 Oct 2022 23:28:52 +0000 Message-Id: <20221010232909.1953738-13-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: I43KJHR64M2H3G2BKLARJBAZA5LT4XVL X-Message-ID-Hash: I43KJHR64M2H3G2BKLARJBAZA5LT4XVL X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In future, we probably want to make sure we only do this once. I haven't decided what the best way to do that would be. Since we're likely going to switch to btrfs anyway for the user partition, it's probably not worth thinking about too much. Signed-off-by: Alyssa Ross --- host/rootfs/default.nix | 10 +++++++--- host/rootfs/etc/s6-rc/ext/up | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 7932845..0b08603 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -6,7 +6,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenvNoCC, nixos, runCommand, writeReferencesToFile, s6-rc, tar2ext4 -, busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod +, busybox, cloud-hypervisor, cryptsetup, execline, e2fsprogs, jq, kmod , mdevd, s6, s6-linux-init, socat, util-linuxMinimal, virtiofsd, xorg }: @@ -44,8 +44,8 @@ let foot = pkgsGui.foot.override { allowPgo = false; }; packages = [ - cloud-hypervisor execline jq kmod mdevd s6 s6-linux-init s6-rc socat - start-vm virtiofsd + cloud-hypervisor e2fsprogs execline jq kmod mdevd s6 s6-linux-init s6-rc + socat start-vm virtiofsd (cryptsetup.override { programs = { @@ -57,11 +57,15 @@ let (busybox.override { extraConfig = '' + CONFIG_CHATTR n CONFIG_DEPMOD n CONFIG_FINDFS n CONFIG_INIT n CONFIG_INSMOD n + CONFIG_LSATTR n CONFIG_LSMOD n + CONFIG_MKE2FS n + CONFIG_MKFS_EXT2 n CONFIG_MODINFO n CONFIG_MODPROBE n CONFIG_RMMOD n diff --git a/host/rootfs/etc/s6-rc/ext/up b/host/rootfs/etc/s6-rc/ext/up index 4e0b9fc..c189471 100644 --- a/host/rootfs/etc/s6-rc/ext/up +++ b/host/rootfs/etc/s6-rc/ext/up @@ -2,4 +2,5 @@ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross if { /etc/mdev/wait ext } +if { resize2fs /dev/ext } mount /dev/ext /ext -- 2.37.1