From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: "José Pekkarinen" <jose.pekkarinen@unikie.com>
Subject: [PATCH 2/2] host/rootfs: remove kernel override
Date: Thu, 1 Sep 2022 10:46:29 +0000 [thread overview]
Message-ID: <20220901104629.863380-2-hi@alyssa.is> (raw)
In-Reply-To: <20220901104629.863380-1-hi@alyssa.is>
These drivers should be loaded by the initramfs if required — most
Spectrum installs won't need the virtio drivers on the host, and
overriding the kernel means more stuff we can't reuse from
cache.nixos.org.
We'll probably want to build in the driver for whatever filesystem we
end up using for the root file system eventually, since it will always
be required, but that should be done as part of a more systematic
effort to optimise our kernel configuration.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
host/rootfs/default.nix | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index e5f316f..a651a20 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -65,14 +65,7 @@ let
imports = [ (modulesPath + "/profiles/all-hardware.nix") ];
});
- kernel = pkgs.linux_latest.override {
- structuredExtraConfig = with lib.kernel; {
- VIRTIO = yes;
- VIRTIO_PCI = yes;
- VIRTIO_BLK = yes;
- EXT4_FS = yes;
- };
- };
+ kernel = pkgs.linux_latest;
packagesSysroot = runCommand "packages-sysroot" {
nativeBuildInputs = [ xorg.lndir ];
--
2.37.1
next prev parent reply other threads:[~2022-09-01 10:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 10:46 [PATCH 1/2] host/rootfs: use initramfs in "make run" Alyssa Ross
2022-09-01 10:46 ` Alyssa Ross [this message]
2022-09-08 11:41 ` [PATCH 2/2] host/rootfs: remove kernel override José Pekkarinen
2022-09-08 12:09 ` Alyssa Ross
2022-09-05 7:49 ` [PATCH 1/2] host/rootfs: use initramfs in "make run" José Pekkarinen
2022-09-08 10:52 ` Alyssa Ross
2022-09-08 11:12 ` José Pekkarinen
2022-09-08 11:30 ` Alyssa Ross
2022-09-08 11:40 ` José Pekkarinen
2022-09-08 12:09 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220901104629.863380-2-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
--cc=jose.pekkarinen@unikie.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).