Unverified Commit 543a5be2 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #197922 from SuperSandro2000/modprobeconfig

parents 85307723 f4d8e64b

nixos/modules/system/boot/modprobe.nix

+4 −1
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ with lib; 
  ###### interface



  options = {

    boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // {

      default = true;

    };



    boot.blacklistedKernelModules = mkOption {

      type = types.listOf types.str;
@@ -38,7 +41,7 @@ with lib; 


  ###### implementation



  config = mkIf (!config.boot.isContainer) {

  config = mkIf config.boot.modprobeConfig.enable {



    environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";

nixos/modules/virtualisation/container-config.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ with lib; 


    # Disable some features that are not useful in a container.



    # containers don't have a kernel

    boot.kernel.enable = false;

    boot.modprobeConfig.enable = false;



    console.enable = mkDefault false;