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,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: by atuin.qyliss.net (Postfix, from userid 496) id 019817D529; Mon, 21 Mar 2022 14:02:21 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 826D07D47D; Mon, 21 Mar 2022 14:01:36 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id AC3577D445; Mon, 21 Mar 2022 14:01:32 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id AEC4B7D49B for ; Mon, 21 Mar 2022 14:01:28 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6B5A65C012E for ; Mon, 21 Mar 2022 10:01:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 21 Mar 2022 10:01:26 -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 :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; bh=7ATpIUmohXlQRMY9S7BoigknPLL+rktZLKq8Kr9cYNs=; b=JC+PJ 5UKAth0iWOHH52R2oFA3j3TjpiA9PjjF3koLuVLfhfLuU1tvUVeHD/F7sQRz9dgO xVAf+/Mg67bV549jQsLtNItsjxB/thrdjViT78KlrbWPBozMxJNivx33xJ/43EI2 oa5rsLI3sg1LaIRusZj+w0A5ZXNZc1fwP3VQDVqUQ0jICNTrdjfSz87tV/No5YXR 9JBT39ZqPHXQZfASYb3MYkw5mjQstheiaiDTotkjobCu8rXlUAT5DDGiUiDXabbR 3qV4XiBQG9z6j2vCIVJ3C7VxZyG8OFJSBmppLJ1zfwXVMxMZ58PpCiMBFLIJHYym asiTJ1ZRnxJPRicVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=7ATpIUmohXlQRMY9S7BoigknPLL+r ktZLKq8Kr9cYNs=; b=lU7e+loDqvnH9GiQiSCuM8zuXnD1KEpzI41X3+fNG7SoY WOASnQ6Ip2UCBknCnCmTIxhMQgiF+A/enkKefp6ZC3klz35/FksXFc8sFGgOIde6 2GUjqkS0HJ5oUorszE0wruqSCgqjwUQNVx96ZMi3708UtVpiHjQL4TW19ETold1e hMOf0tcffWrbae+O7kTBUGEpSxWTk+rLzk6Wi53Gwc/SUbCej1kY5+/JkGsS+tg2 JZR+QexFm27mWwCxxa7bPFpaKYduhJ7ddNnffpSK9g2ISWjL0pKXhpkeQxlPEjR+ Pk7aujlNRlu+bhRCxmsjmMPhd3wkaY/cvcPxDyZMQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudegfedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 21 Mar 2022 10:01:26 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 6919D8480; Mon, 21 Mar 2022 14:01:24 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 1/2] Busybox modprobe is banned Date: Mon, 21 Mar 2022 14:01:06 +0000 Message-Id: <20220321140107.1043654-1-hi@alyssa.is> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TVOUTR72VDKDSEOFC2LGVEHEVXTENKPQ X-Message-ID-Hash: TVOUTR72VDKDSEOFC2LGVEHEVXTENKPQ X-MailFrom: qyliss@eve.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; 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: Trying to use modprobe from Busybox has caused nothing but problems. The latest issue is that it doesn't implement softdep at all. rootfs.ext4 before: 509M rootfs.ext4 after: 513M Thanks-to: Puck Meerburg --- host/initramfs/default.nix | 8 +++++++- host/rootfs/default.nix | 10 ++++++++-- vm/app/catgirl/default.nix | 15 +++++++++++++-- vm/app/lynx/default.nix | 15 +++++++++++++-- vm/sys/net/default.nix | 15 +++++++++++++-- 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index b207ace..5ce198a 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -16,7 +16,7 @@ let linux = rootfs.kernel; packages = [ - pkgsStatic.mdevd pkgsStatic.execline + pkgsStatic.execline pkgsStatic.kmod pkgsStatic.mdevd (pkgsStatic.cryptsetup.override { programs = { @@ -29,7 +29,13 @@ let (busybox.override { enableStatic = true; extraConfig = '' + CONFIG_DEPMOD n CONFIG_FINDFS n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n ''; }) ]; diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index b9fabee..2f2c368 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -4,7 +4,7 @@ { pkgs ? import {} }: pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, s6-rc, tar2ext4 -, busybox, cloud-hypervisor, cryptsetup, execline, jq, mdevd, s6 +, busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod, mdevd, s6 , s6-linux-utils, s6-portable-utils, socat, util-linuxMinimal, xorg }: @@ -20,7 +20,7 @@ let foot = pkgsGui.foot.override { allowPgo = false; }; packages = [ - cloud-hypervisor execline jq mdevd s6 s6-linux-utils + cloud-hypervisor execline jq kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc socat start-vm (cryptsetup.override { @@ -33,8 +33,14 @@ let (busybox.override { extraConfig = '' + CONFIG_DEPMOD n CONFIG_FINDFS n CONFIG_INIT n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n ''; }) ] ++ (with pkgsGui; [ foot westonLite ]); diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index ed897eb..716e7dd 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, catgirl, execline, mdevd, s6, s6-linux-utils +, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-utils , s6-portable-utils }: @@ -17,7 +17,18 @@ let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - busybox catgirl execline mdevd s6 s6-linux-utils s6-portable-utils s6-rc + catgirl execline kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc + + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) ]; packagesSysroot = runCommand "packages-sysroot" { diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index 90fda0f..72bff7f 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, execline, lynx, mdevd, s6, s6-linux-utils +, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-utils , s6-portable-utils }: @@ -17,7 +17,18 @@ let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - busybox execline lynx mdevd s6 s6-linux-utils s6-portable-utils s6-rc + execline kmod lynx mdevd s6 s6-linux-utils s6-portable-utils s6-rc + + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) ]; packagesSysroot = runCommand "packages-sysroot" { diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index a9e1fdc..62a13bb 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4, xorg -, busybox, connmanMinimal, dbus, execline, mdevd, nftables, s6 +, busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6 , s6-linux-utils, s6-portable-utils }: @@ -19,9 +19,20 @@ let connman = connmanMinimal; packages = [ - busybox connman dbus execline mdevd s6 s6-linux-utils + connman dbus execline kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) + (nftables.override { withCli = false; }) ]; -- 2.35.1