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 1D6C0904E9; Mon, 10 Oct 2022 23:33:00 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 55B8690254; 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 CDE9E90079 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 3903A5C01B9 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.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=/C 9M0XPKR3PfDrT8V0BkNV6Sn9cosM/foQmHSytf5C4=; b=XPJ45h5B9z+Rq2CXGW cCcet8feZZNfUUnV2S7oZacpPMVarl/U0kO3HSE0amr6smHbo6MSkO2mj/xBSDnD IbLYZTdw2ymOn9jiP/c6UyM9lTjOlv2KszN4h2nkmQZ1yOSqZ60hoaHyPS1o8ncT 4hoWp5YWLNDnZu2RztagUlhi4Y3+ZNe445oPhJqVIz51rUzl2AZha4UdyhChloBe neGA8vqGaN2C72yGisWE26hw/jalQOkwPRAubT7NEljcQC/en/NAZz2msETPo4J7 HNBQ5aFWgbiNLRqEqdOvU45NQe+wVPIKgslF47t8mPcjR25rzaJTtDpkT1/g4Z0R XnMA== 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=/C9M0XPKR3PfD rT8V0BkNV6Sn9cosM/foQmHSytf5C4=; b=eEA17MA45yQyngNHslLR8hftwp2xM dHrCfgGVTbfZvNoYycdLFlaYmxmTXIdkIiTmpTydCGhDfiVKfMIdeMgZzDwV/Olz m0yzKe4t+mOF9ZSYMpWrKIw6zS7HJyvuQw6TxgIhO3xAf9h+g/el8b0p6YRg3LsB qt9FA+NiSujVtiKNhf5wlGSQk/e5AHzJ971ykFS/8GyJTw6SxNzmzixis4Y54QSI JDA8VZuDJAgb14fTc1OLzhpk7KTi13twcDsUUqWzPsbPUetlD5cF6ED/PqNdMtj8 fapgss7L5nApkSRjAVgAGsUGUQP+YKt+uFs9mtHGTo+M1MkkGj3bPC0wg== 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:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 766C2CBF; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 10/22] vm/app/mg.nix: open virtio filesystem in dired Date: Mon, 10 Oct 2022 23:28:50 +0000 Message-Id: <20221010232909.1953738-11-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: D2WWJ7MNXDENKYCTK7FNZ5D24DTOW7CO X-Message-ID-Hash: D2WWJ7MNXDENKYCTK7FNZ5D24DTOW7CO 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: Signed-off-by: Alyssa Ross --- vm/app/mg.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vm/app/mg.nix b/vm/app/mg.nix index 391b518..fdfef8f 100644 --- a/vm/app/mg.nix +++ b/vm/app/mg.nix @@ -6,5 +6,12 @@ import ../make-vm.nix { inherit config; } { providers.net = [ "netvm" ]; sharedDirs.virtiofs0.path = "/ext"; - run = "${config.pkgs.pkgsStatic.mg}/bin/mg"; + run = config.pkgs.pkgsStatic.callPackage ( + { writeScript, mg }: + writeScript "run-mg" '' + #!/bin/execlineb -P + if { /etc/mdev/wait virtiofs0 } + ${mg}/bin/mg /run/virtiofs/virtiofs0 + '' + ) { }; } -- 2.37.1