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 402CF90313; Mon, 10 Oct 2022 23:32:40 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id D62BF90170; Mon, 10 Oct 2022 23:32:25 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 20460900CA for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 1F3D05C01AA for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 10 Oct 2022 19:32:09 -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=1665444729; x=1665531129; bh=iS qXsBhZI9c5EgldBE+77yCXNXgEbEoQXOdYDAY7pjg=; b=sFrM3kRO977+W+8AMX 8s2G2y/3YiY7iX7ymE6J9HqhGiH2UzmCCfQnRB9EQp3EyNcbfpqG4v7Yj1eKg0CB 5pMmo4Sn5xqqypDmoXD0WOegUBSg7+VmqGDxZodezLL7UEtCIDym5f6d3QTkKS3d +EepIekJxIS7tmwhEet3Bq04Mmxy7jh9g9kVSX74gdYJFC3xbcgUX1QFQlgcH9q9 dpSbFk9vXc743ugxPougx2W8qLlAYJeHm3pBgcM3JecI6oJ489/NaBNMnv7yEA4R 4RvGCQXBuaUsl1ey4OuCbALTBgJ3sutY0tFCKm+CyUeGP5u8sPlvgfsUjs4jaFVw 1sSg== 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=1665444729; x=1665531129; bh=iSqXsBhZI9c5E gldBE+77yCXNXgEbEoQXOdYDAY7pjg=; b=bxKHVXrt6SvnGBJOr0wf7ip0ptkRQ cFhFBa0DNw7bJN8HsAfwhAI1Yni7Vb1u9iqB3UFrSUSTnUTx3MhhrsQs0YhmPzRZ Gan2Z1+5B97d/zsSzxAhZDvwodIDj9oZvRUa5dQ+TKSO98r4QTi0Ag9oVTj4Cisj Xz0cpcvaQPy6J37vDB++28LNuCXTz1Ylm4+5wwDuX+mHxzBU0SjnQkP/x60JpnqI Bvm4RpuPGQCTG4U8+N/WsRvatSnAnDtc5m3cCwrjhNTSDfbNeCc4mwuCB5XnpIrS eMFbltZBJzSRqgStw9FK0PbpbTizZwSwi9wQwuze1R8CU3rCwqWZUo7ig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgeejkefghedthffhvdfgkeetkeffudfgvedtfeetue efgeduiedugfevheettddvnecuffhomhgrihhnpehprhhovhhiuggvrhhsrdhnvghtpdhp khhgshhsthgrthhitgdrmhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:08 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 68484BBA; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 09/22] vm/app/mg.nix: init Date: Mon, 10 Oct 2022 23:28:49 +0000 Message-Id: <20221010232909.1953738-10-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: LR3GVBPLGJFJZF5BNCBT22VUSKHG2I7I X-Message-ID-Hash: LR3GVBPLGJFJZF5BNCBT22VUSKHG2I7I 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: mg is a text editor with a built-in filesystem browser, so it will be useful for testing virtiofs. Signed-off-by: Alyssa Ross --- host/initramfs/extfs.nix | 4 +++- vm/app/mg.nix | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 vm/app/mg.nix diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix index dec4017..0ee337b 100644 --- a/host/initramfs/extfs.nix +++ b/host/initramfs/extfs.nix @@ -11,18 +11,20 @@ let appvm-catgirl = import ../../vm/app/catgirl.nix { inherit config; }; appvm-lynx = import ../../vm/app/lynx.nix { inherit config; }; + appvm-mg = import ../../vm/app/mg.nix { inherit config; }; in runCommand "ext.ext4" { nativeBuildInputs = [ tar2ext4 ]; } '' - mkdir -p svc/data/appvm-{catgirl,lynx} + mkdir -p svc/data/appvm-{catgirl,lynx,mg} tar -C ${netvm} -c data | tar -C svc -x chmod +w svc/data tar -C ${appvm-catgirl} -c . | tar -C svc/data/appvm-catgirl -x tar -C ${appvm-lynx} -c . | tar -C svc/data/appvm-lynx -x + tar -C ${appvm-mg} -c . | tar -C svc/data/appvm-mg -x tar -cf ext.tar svc tar2ext4 -i ext.tar -o $out diff --git a/vm/app/mg.nix b/vm/app/mg.nix new file mode 100644 index 0000000..391b518 --- /dev/null +++ b/vm/app/mg.nix @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 Alyssa Ross + +{ config ? import ../../../nix/eval-config.nix {} }: + +import ../make-vm.nix { inherit config; } { + providers.net = [ "netvm" ]; + sharedDirs.virtiofs0.path = "/ext"; + run = "${config.pkgs.pkgsStatic.mg}/bin/mg"; +} -- 2.37.1