Skip to content

Commit

Permalink
nixos/ksm: remove udev-settle dependency
Browse files Browse the repository at this point in the history
The sysfs file /sys/kernel/mm/ksm/run seems to be available as soon as
the kernel has started, so no point in waiting for udev to "settle". If
for some reason it doesn't, we let the unit fail explicitly.
  • Loading branch information
rnhmjoj committed Feb 26, 2021
1 parent ed0a29c commit 48052ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions nixos/modules/hardware/ksm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ in {
systemd.services.enable-ksm = {
description = "Enable Kernel Same-Page Merging";
wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ];
script = ''
if [ -e /sys/kernel/mm/ksm ]; then
script =
''
echo 1 > /sys/kernel/mm/ksm/run
${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''}
fi
'';
'' + optionalString (cfg.sleep != null)
''
echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs
'';
};
};
}
4 changes: 2 additions & 2 deletions nixos/tests/ksm.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ./make-test-python.nix ({ pkgs, ...} :
import ./make-test-python.nix ({ lib, ...} :

{
name = "ksm";
meta = with pkgs.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ rnhmjoj ];
};

Expand Down

0 comments on commit 48052ca

Please sign in to comment.