tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nixos treewide: don't set MODULE_DIR
Nikolay Amiantov
9 years ago
6b41f113
5ff6e984
+1
-17
8 changed files
expand all
collapse all
unified
split
nixos
modules
hardware
video
bumblebee.nix
webcam
facetimehd.nix
services
hardware
tlp.nix
udev.nix
system
boot
kernel.nix
modprobe.nix
stage-2-init.sh
virtualisation
docker.nix
-1
nixos/modules/hardware/video/bumblebee.nix
···
75
serviceConfig = {
76
ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}";
77
};
78
-
environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
79
};
80
};
81
}
···
75
serviceConfig = {
76
ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}";
77
};
0
78
};
79
};
80
}
-1
nixos/modules/hardware/video/webcam/facetimehd.nix
···
36
37
# and load it back on resume
38
powerManagement.resumeCommands = ''
39
-
export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
40
${pkgs.kmod}/bin/modprobe -v facetimehd
41
'';
42
···
36
37
# and load it back on resume
38
powerManagement.resumeCommands = ''
0
39
${pkgs.kmod}/bin/modprobe -v facetimehd
40
'';
41
-4
nixos/modules/services/hardware/tlp.nix
···
72
ExecStart = "${tlp}/bin/tlp init start";
73
ExecStop = "${tlp}/bin/tlp init stop";
74
};
75
-
76
-
environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
77
};
78
79
tlp-sleep = {
···
92
ExecStart = "${tlp}/bin/tlp suspend";
93
ExecStop = "${tlp}/bin/tlp resume";
94
};
95
-
96
-
environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
97
};
98
};
99
···
72
ExecStart = "${tlp}/bin/tlp init start";
73
ExecStop = "${tlp}/bin/tlp init stop";
74
};
0
0
75
};
76
77
tlp-sleep = {
···
90
ExecStart = "${tlp}/bin/tlp suspend";
91
ExecStop = "${tlp}/bin/tlp resume";
92
};
0
0
93
};
94
};
95
+1
-2
nixos/modules/services/hardware/udev.nix
···
316
'';
317
318
systemd.services.systemd-udevd =
319
-
{ environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
320
-
restartTriggers = cfg.packages;
321
};
322
323
};
···
316
'';
317
318
systemd.services.systemd-udevd =
319
+
{ restartTriggers = cfg.packages;
0
320
};
321
322
};
-5
nixos/modules/system/boot/kernel.nix
···
228
systemd.services."systemd-modules-load" =
229
{ wantedBy = [ "multi-user.target" ];
230
restartTriggers = [ kernelModulesConf ];
231
-
environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
232
serviceConfig =
233
{ # Ignore failed module loads. Typically some of the
234
# modules in ‘boot.kernelModules’ are "nice to have but
···
236
# barf on those.
237
SuccessExitStatus = "0 1";
238
};
239
-
};
240
-
241
-
systemd.services.kmod-static-nodes =
242
-
{ environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
243
};
244
245
lib.kernelConfig = {
···
228
systemd.services."systemd-modules-load" =
229
{ wantedBy = [ "multi-user.target" ];
230
restartTriggers = [ kernelModulesConf ];
0
231
serviceConfig =
232
{ # Ignore failed module loads. Typically some of the
233
# modules in ‘boot.kernelModules’ are "nice to have but
···
235
# barf on those.
236
SuccessExitStatus = "0 1";
237
};
0
0
0
0
238
};
239
240
lib.kernelConfig = {
-2
nixos/modules/system/boot/modprobe.nix
···
63
echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe
64
'';
65
66
-
environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
67
-
68
};
69
70
}
···
63
echo ${pkgs.kmod}/bin/modprobe > /proc/sys/kernel/modprobe
64
'';
65
0
0
66
};
67
68
}
-1
nixos/modules/system/boot/stage-2-init.sh
···
207
# Start systemd.
208
echo "starting systemd..."
209
PATH=/run/current-system/systemd/lib/systemd \
210
-
MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
211
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
212
exec systemd
···
207
# Start systemd.
208
echo "starting systemd..."
209
PATH=/run/current-system/systemd/lib/systemd \
0
210
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
211
exec systemd
-1
nixos/modules/virtualisation/docker.nix
···
96
} // proxy_env;
97
98
path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
99
-
environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
100
101
postStart = if cfg.socketActivation then "" else cfg.postStart;
102
···
96
} // proxy_env;
97
98
path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
0
99
100
postStart = if cfg.socketActivation then "" else cfg.postStart;
101