From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 0CE915E32D; Thu, 8 Sep 2022 10:04:11 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 62E085E2E8; Thu, 8 Sep 2022 10:04:08 +0000 (UTC) X-Remote-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Remote-Spam-Level: X-Remote-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by atuin.qyliss.net (Postfix) with ESMTPS id 4A0985E317 for ; Thu, 8 Sep 2022 10:04:06 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id bx38so19222654ljb.10 for ; Thu, 08 Sep 2022 03:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=5/tRoWLKM3CwLFDxZddP2F2mm1eClxrt3lyX8pnCVzM=; b=IavtmyuXNSQuth6T0eyiVeePpmoHkihMjb2/coRL2ofngpenzArJjwxCnJaWPgeJrH cIfKwzccNvXL63R4EZSYk13lQU3VNADLY03XAVK+jzXvHUjVu7/8SpEpGgx5x2F1LpbM lFFd34gHhZNg4WNjkYRExigFPirbCR2qro0rpRUnGhyvSH6mmG4q9QwIM3PQB/UVEncx WdSs2eggsT9BzuBTFN1m6+Z/vLNtB7M7FjK97JuwH7Xe9uLgCVxdwCZhCJUQDCwgv60m PIcy/59o4zwPM30mRjXwOI5lsAJZTLiLEhxBql6M97lRj4tndpqou4fW83zcvAkoNxV2 t0JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=5/tRoWLKM3CwLFDxZddP2F2mm1eClxrt3lyX8pnCVzM=; b=Iww6A8WVQDVjeiMIxw0z/QRMTNpc+BWyRdj3yra+KTBsHIW0bRnqaoBZFe4VJXOxin EDkLkQLmBgDKso+DGQubWoGuc5kHygHiT93hoXWMc1IiaA90V9b0RgD3FaML9DKtcMHT mvfSnSZKdMvjXPkO2ZmRvsE+pEkVyGP/4UnRBZmVng4CyK6pJgxIAnIftdcg6bNlAShm 3DR2gXTd24T5B0xy8pPNGlYBCJbUXeLM0t8RQAWwg1Sk024Yh1XY783OJulO+pm9zHMo HD6LE/HSAVw5LRKFrsq5GAvq/MP+pQ0fcqCBot2Ciwv/jLgIsgIb9VXFM9hWD14PKK0d eMIA== X-Gm-Message-State: ACgBeo21xu+G0iCWCnlYlOnz82h5IzPc4XmZBnCBKfkuGuBPj/u8YJYI TvMpaO6bwtUNTV0L/u//Q5ZxD1rqUDqw9Hxs2CE= X-Google-Smtp-Source: AA6agR4LQRJYQPjfI3klt+/8L6T2MTt4osMYXHd5QOL9cKhVndQ2jy0NoshrMp5aH8yfuCw/u3Nozg== X-Received: by 2002:a2e:3817:0:b0:26a:d369:ca71 with SMTP id f23-20020a2e3817000000b0026ad369ca71mr1277284lja.191.1662631443284; Thu, 08 Sep 2022 03:04:03 -0700 (PDT) Received: from Unikie-T14-Gen-2i.madriguera.foxhound.fi (91-157-106-8.elisa-laajakaista.fi. [91.157.106.8]) by smtp.googlemail.com with ESMTPSA id w7-20020a2e9987000000b00261b9ccb18esm922641lji.10.2022.09.08.03.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 03:04:02 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= To: devel@spectrum-os.org Subject: [PATCH v2] host/rootfs: remove kernel override Date: Thu, 8 Sep 2022 13:04:01 +0300 Message-Id: <20220908100401.14420-1-jose.pekkarinen@unikie.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: AJMWKM4S6Y3OV2KJZOMIHY2OZAJLZ544 X-Message-ID-Hash: AJMWKM4S6Y3OV2KJZOMIHY2OZAJLZ544 X-MailFrom: jose.pekkarinen@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Alyssa Ross , =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= 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: X-TUID: jiG3A7UvSG1g From: Alyssa Ross 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 Signed-off-by: José Pekkarinen --- [ v1 -> v2 ] Request mdev to load modules on boot host/rootfs/default.nix | 9 +-------- host/rootfs/etc/modules-autoload.d/modules.conf | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 host/rootfs/etc/modules-autoload.d/modules.conf 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 ]; diff --git a/host/rootfs/etc/modules-autoload.d/modules.conf b/host/rootfs/etc/modules-autoload.d/modules.conf new file mode 100644 index 0000000..dd9529a --- /dev/null +++ b/host/rootfs/etc/modules-autoload.d/modules.conf @@ -0,0 +1,4 @@ +virtio +virtio_pci +virtio_blk +ext4 -- 2.25.1