summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-03-21 14:01:06 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-22 08:33:28 +0000
commitcf7e089a907439c6293f85bc46e9c9f6319d7509 (patch)
tree4d2f2d4f9ed7f1ce2ef941ee77b9470b9d9a7cb6
parent85e9676db986e23104bda6d25e4bf03a54bb23e9 (diff)
downloadspectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar.gz
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar.bz2
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar.lz
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar.xz
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.tar.zst
spectrum-cf7e089a907439c6293f85bc46e9c9f6319d7509.zip
Busybox modprobe is banned
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 <puck@puckipedia.com>
Message-Id: <20220321140107.1043654-1-hi@alyssa.is>
Tested-by: Ville Ilvonen <ville.ilvonen@unikie.com>
-rw-r--r--host/initramfs/default.nix8
-rw-r--r--host/rootfs/default.nix10
-rw-r--r--vm/app/catgirl/default.nix15
-rw-r--r--vm/app/lynx/default.nix15
-rw-r--r--vm/sys/net/default.nix15
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 <nixpkgs> {} }: 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; })
   ];