From 88292fdf09960e9cb8e3c063a6b95ac4284222ec Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 6 Jan 2016 06:50:18 +0000 Subject: jobs -> systemd.services --- nixos/modules/services/hardware/acpid.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'nixos/modules/services/hardware/acpid.nix') diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index a20b1a1ee3ad..e3421899d36e 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -98,22 +98,26 @@ in config = mkIf config.services.acpid.enable { - jobs.acpid = - { description = "ACPI Daemon"; + systemd.services.acpid = { + description = "ACPI Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; - path = [ pkgs.acpid ]; + path = [ pkgs.acpid ]; - daemonType = "fork"; - - exec = "acpid --confdir ${acpiConfDir}"; + serviceConfig = { + Type = "forking"; + }; - unitConfig.ConditionVirtualization = "!systemd-nspawn"; - unitConfig.ConditionPathExists = [ "/proc/acpi" ]; + unitConfig = { + ConditionVirtualization = "!systemd-nspawn"; + ConditionPathExists = [ "/proc/acpi" ]; }; + script = "acpid --confdir ${acpiConfDir}"; + }; + }; } -- cgit 1.4.1