diff --git a/flake.nix b/flake.nix index 0a64679..759f454 100644 --- a/flake.nix +++ b/flake.nix @@ -112,6 +112,10 @@ EOF chmod 644 ./etc/group + # install lib kmod + cp ${pkgs.kmod.lib}/lib/* ./usr/lib + cp ${pkgs.libbpf.out}/lib/libbpf* ./usr/lib + # install busybox cp ${pkgs.busybox.out}/bin/busybox usr/bin/ usr/bin/busybox --list | xargs -I {} ln -sf busybox usr/bin/{} diff --git a/systemd/default.nix b/systemd/default.nix index ce35023..8ab1fe6 100644 --- a/systemd/default.nix +++ b/systemd/default.nix @@ -187,19 +187,21 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "mode" "release") (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 - (lib.mesonOption "kmod-path" "/bin/kmod") - (lib.mesonOption "debug-shell" "/bin/sh") + # Use busybox kernel modules tools instead + (lib.mesonOption "kmod-path" "") + + (lib.mesonOption "debug-shell" "/usr/bin/sh") (lib.mesonOption "pamconfdir" "/etc/pam.d") (lib.mesonOption "shellprofiledir" "/etc/profile.d") (lib.mesonOption "dbuspolicydir" "/usr/share/dbus-1/system.d") (lib.mesonOption "dbussessionservicedir" "/usr/share/dbus-1/services") (lib.mesonOption "dbussystemservicedir" "/usr/share/dbus-1/system-services") - (lib.mesonOption "setfont-path" "/bin/setfont") - (lib.mesonOption "loadkeys-path" "/bin/loadkeys") - (lib.mesonOption "sulogin-path" "/bin/sulogin") - (lib.mesonOption "nologin-path" "/bin/nologin") - (lib.mesonOption "mount-path" "/bin/mount") - (lib.mesonOption "umount-path" "/bin/umount") + (lib.mesonOption "setfont-path" "/usr/bin/setfont") + (lib.mesonOption "loadkeys-path" "/usr/bin/loadkeys") + (lib.mesonOption "sulogin-path" "/usr/bin/sulogin") + (lib.mesonOption "nologin-path" "/usr/bin/nologin") + (lib.mesonOption "mount-path" "/usr/bin/mount") + (lib.mesonOption "umount-path" "/usr/bin/umount") # SBAT (lib.mesonOption "sbat-distro" "patos")