nixos treewide: don't set MODULE_DIR

This commit is contained in:
Nikolay Amiantov
2016-08-19 17:56:54 +03:00
parent 5ff6e98486
commit 6b41f1132c
8 changed files with 1 additions and 17 deletions
-5
View File
@@ -228,7 +228,6 @@ 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
@@ -238,10 +237,6 @@ 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;
-2
View File
@@ -63,8 +63,6 @@ with lib;
echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe
'';
environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
};
}
@@ -207,6 +207,5 @@ exec {logOutFd}>&- {logErrFd}>&-
# Start systemd.
echo "starting systemd..."
PATH=/run/current-system/systemd/lib/systemd \
MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
exec systemd