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 D8813903DC; Mon, 10 Oct 2022 23:32:49 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id B0424901BA; Mon, 10 Oct 2022 23:32:30 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 8DFBC900CF for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2F1535C01B1 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.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=9S CQECotls7mYLmCDBcAs0mTMPQnCr9I4Vrez2sxdsk=; b=AJLam6C2vSy2rTtuVL gZgb3TpNk6u+zUbblfOYp/x9rsOMoqYj3m6AoTO8rk4CjpHajLyWcZJtHoFc6823 aaoGntZcfdHq2hglPLQh4cW6r42vwf/K0LSg4Zrp3rXomsZAc2KLL1JZxJ5Qxh0i U5nBz30HO2ij5Uesoh59jtjdmfvsvdul4K4k+C26hMH83RCasNwBYxErNflZhfjc YJ0Nz96b7tQyb8cF97O7H06iFtqe/WEBzUJZgDPA6HwspgQCXbHkLsAFiMXK/k9V QvwwxPQXGNjwDqU1S+NYGlibWebZTkFd1UhQ7rXAjn7980cdmNKviBnmpnf7IFb0 mGuQ== 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=9SCQECotls7mY LmCDBcAs0mTMPQnCr9I4Vrez2sxdsk=; b=K5p5tzfbDnYKWuFItLp8RkrWT3wt7 uUoHUbhyuTiFsueAt8Q8hmBBJ21ZD6BjG4qAKvXIP2nA1mCsuWx80PZvhXHI77Tz TKC2ghUBqCq4atO+UYo+cFx+BJaQ/qO8qUuCxBUCE45VbKUl4GmiY95g0Q5lnLEy m2tBAHds+uvdR4TlDsYq+Id8DXUsBpElwjWwmQkj7KHOcWy48tSf20/H4bNbT6r8 378n/IIrowoSE+kMicuyyNYCs/DQ4hCL3e9kIvhKdLWC+4FIYuiDedIdIslKQEdu qSr9cj9ibgp/FeDiBKG+DQhRbYVrYvFeUFI8ikY+be/IjY5d4OexGseVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvdduucetufdoteggodetrfdotf 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 2644BBC4; Mon, 10 Oct 2022 23:32:07 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 21/22] host/initramfs/extfs.nix: add example Nix-built VM Date: Mon, 10 Oct 2022 23:29:01 +0000 Message-Id: <20221010232909.1953738-22-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: DKJRXCN7342ZKWT5UKHH27U3SRMLKVOF X-Message-ID-Hash: DKJRXCN7342ZKWT5UKHH27U3SRMLKVOF 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: This adds the Nix files that define a very simple VM that just runs the "yes" command, which repeatedly prints 'y' to the console. Only the Nix files that define the VM are added, and not the VM itself, so it will only appear when vm-rebuild is run in appvm-nix. Signed-off-by: Alyssa Ross --- host/initramfs/extfs.nix | 11 ++++++++++- vm/app/nix/example.nix | 13 +++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 vm/app/nix/example.nix diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix index 9f00793..4319afb 100644 --- a/host/initramfs/extfs.nix +++ b/host/initramfs/extfs.nix @@ -4,6 +4,8 @@ { config, runCommand, e2fsprogs, tar2ext4 }: let + inherit (config.pkgs) lib; + netvm = import ../../vm/sys/net { inherit config; # inherit (foot) terminfo; @@ -13,12 +15,16 @@ let appvm-lynx = import ../../vm/app/lynx.nix { inherit config; }; appvm-mg = import ../../vm/app/mg.nix { inherit config; }; appvm-nix = import ../../vm/app/nix { inherit config; }; + + vmsNix = ../../vm/app/nix/example.nix; + spectrumNix = + builtins.filterSource (name: _type: lib.hasSuffix ".nix" name) ../../vm-lib; in runCommand "ext.ext4" { nativeBuildInputs = [ e2fsprogs ]; } '' - mkdir -p root/svc/data/appvm-{catgirl,lynx,mg,nix} + mkdir -p root/svc/data/appvm-{catgirl,lynx,mg,nix} root/vm-config cd root tar -C ${netvm} -c data | tar -C svc -x @@ -29,6 +35,9 @@ runCommand "ext.ext4" { tar -C ${appvm-mg} -c . | tar -C svc/data/appvm-mg -x tar -C ${appvm-nix} -c . | tar -C svc/data/appvm-nix -x + cp ${vmsNix} vm-config/vms.nix + cp -R ${spectrumNix} vm-config/spectrum + mkfs.ext4 -d . $out 16T resize2fs -M $out diff --git a/vm/app/nix/example.nix b/vm/app/nix/example.nix new file mode 100644 index 0000000..55068d1 --- /dev/null +++ b/vm/app/nix/example.nix @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 Alyssa Ross + +import {} ({ makeVm, pkgs }: { + appvm-yes = makeVm { + run = pkgs.pkgsStatic.callPackage ( + { writeShellScript, coreutils }: + writeShellScript "appvm-yes-run" '' + ${coreutils}/bin/yes + '' + ) {}; + }; +}) -- 2.37.1