From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id E64215C372; Thu, 1 Sep 2022 10:47:08 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id B613A5C2E6; Thu, 1 Sep 2022 10:47:05 +0000 (UTC) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by atuin.qyliss.net (Postfix) with ESMTPS id 5F67C5C349 for ; Thu, 1 Sep 2022 10:47:01 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 1CD04320095C; Thu, 1 Sep 2022 06:46:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 01 Sep 2022 06:46:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1662029218; x= 1662115618; bh=1J8Yaw1R3Hd8dxzIf33w8UXpz7+A7XeeXKh4ez1Nedg=; b=J bcrsexAuv2PyKpOJ8LfdUhPQ2wHYEvYrGEK9gO1yuBWTNjGaPHZzUXZCx5h8PiMN SqzysgcULqSObJ5mLJnW63eWB8wt8WP28eA4XRcHD73DRKuFgAzTb2WdbrzKBTyJ iYP15kDeV2zujMHj7k73+N+BYaNg3ExW/ve2vOhF45TFsHb51gwu9exGwuCrZtQV F/12kkBrN4AIyQ0npqitLL/t9Z14in3v++TpNvqGVJiMyCkNkx8sqA1aJB3UpqSB 927SunTAyHkumSU+a8idA5lx21C/gwuSGoKPLOklOERiEW9ZAJUO8cZn7/2xXUn7 0/xrlhIxLQOw2QwA5Gsxg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=fm1; t=1662029218; x= 1662115618; bh=1J8Yaw1R3Hd8dxzIf33w8UXpz7+A7XeeXKh4ez1Nedg=; b=0 hiQKVAjYSjtxeOqt8dx8RWeC4GyD47zJxpTLIFyAFrqcuUMySY9mRtGOVORkjyKP Lg7wtYUfdoS02Q5T645xtNMLibx62GSmuM5EVC0mHULB29P5KMcCOnQOzxJW5gQX CruNd+kvqacQwZgbalEmauAaQheSwQjAtLxoh5GNQgThlrKNo8WUWioj5mQi5cuS CzZxUmYRLc/jNrD7VP3Zonn80uPd+swsoLAEn35eCt3ibb46AcEXHvHDzofC+GSy 3r52hzO2IxNkLX5G0lhmu/mS9GqNlYcgxAn/3EYXmX5oXALzbFQPxWjhe73Sot1t 03dwB2Rkeqv/Ux6+RvP8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekkedgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeetlhih shhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpe eiffethfduhfeuuddvleffueetffffffefkeetgeeileekhfdvjeefieffhfeftdenucff ohhmrghinhepnhhigihoshdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 1 Sep 2022 06:46:58 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id EFFAA6F4; Thu, 1 Sep 2022 10:46:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 2/2] host/rootfs: remove kernel override Date: Thu, 1 Sep 2022 10:46:29 +0000 Message-Id: <20220901104629.863380-2-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220901104629.863380-1-hi@alyssa.is> References: <20220901104629.863380-1-hi@alyssa.is> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: NUV3SZ2OI6LWTZUDBE2H2N5M7FE6FL3Z X-Message-ID-Hash: NUV3SZ2OI6LWTZUDBE2H2N5M7FE6FL3Z 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 CC: =?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: 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 --- 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