diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-14 13:01:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-16 00:19:25 +0300 |
| commit | 1f639587729daf6c34535addbc35fd6e5c816ffc (patch) | |
| tree | 2c9f6d40471e26eea0161294fe846bb32fe6a8ea /nixos/modules/system | |
| parent | b2ebecd9e50471ec967ab9cdb2aba793d75cb747 (diff) | |
| download | nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar.gz nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar.bz2 nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar.lz nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar.xz nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.tar.zst nixlib-1f639587729daf6c34535addbc35fd6e5c816ffc.zip | |
nixos treewide: don't set MODULE_DIR
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/system/boot/modprobe.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index a6bbca9b30bb..0f342f44fe76 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -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; diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 91f440535a48..b915a98d5375 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -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"; - }; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 4a7f073ea8ad..c5a14f0766d5 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -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 |