aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules/services/hardware/udev.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-17 18:52:31 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-17 18:52:31 +0200
commit179acfb664ed06519ac515eada7bbef677cbee87 (patch)
tree76c599294fe8ce8530b92c8a36f9b2adc7ee0595 /nixos/modules/services/hardware/udev.nix
parent8dcf76480c34520997816d1bf4cfd68c6280ebbd (diff)
Allow upstream systemd units to be extended
If you define a unit, and either systemd or a package in systemd.packages already provides that unit, then we now generate a file /etc/systemd/system/<unit>.d/overrides.conf. This makes it possible to use upstream units, while allowing them to be customised from the NixOS configuration. For instance, the module nix-daemon.nix now uses the units provided by the Nix package. And all unit definitions that duplicated upstream systemd units are finally gone. This makes the baseUnit option unnecessary, so I've removed it.
Diffstat (limited to '')
-rw-r--r--nixos/modules/services/hardware/udev.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 875de55b6c6d..169a2e884147 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -244,8 +244,7 @@ in
'';
systemd.services.systemd-udevd =
- { baseUnit = "${config.systemd.package}/example/systemd/system/systemd-udevd.service";
- environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+ { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
};
};