Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit57b2d1e9b0, reversing changes made to760b2b9048.
This commit is contained in:
@@ -228,6 +228,7 @@ in
|
||||
systemd.services."systemd-modules-load" =
|
||||
{ wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ kernelModulesConf ];
|
||||
environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
|
||||
serviceConfig =
|
||||
{ # Ignore failed module loads. Typically some of the
|
||||
# modules in ‘boot.kernelModules’ are "nice to have but
|
||||
@@ -237,6 +238,10 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.kmod-static-nodes =
|
||||
{ environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
|
||||
};
|
||||
|
||||
lib.kernelConfig = {
|
||||
isYes = option: {
|
||||
assertion = config: config.isYes option;
|
||||
|
||||
Reference in New Issue
Block a user