Re: [PATCH 2/2] host/rootfs: remove kernel override

José Pekkarinen
2022-09-08T11:41:58Z

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

On Thu, Sep 1, 2022 at 1:47 PM Alyssa Ross <hi@alyssa.is> wrote:

> 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>
>

Tested-by: José Pekkarinen <jose.pekkarinen@unikie.com>

> ---
> 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
>
>

--

José.

[-- Attachment #2: Type: text/html, Size: 2435 bytes --]