From 8abea71eaa2367edca69ca2414efc3e0c94d3b61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:30:10 +0000
Subject: [PATCH] modules/services/monitoring/smartd.nix: run the daemon with
 --no-fork to make life easier for upstart

svn path=/nixos/trunk/; revision=29287
---
 modules/services/monitoring/smartd.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 154c630e18c..5a94caefd3b 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -70,16 +70,14 @@ in
 
   config = mkIf cfg.enable {
 
-    jobs.smartd =
-      { description = "S.M.A.R.T. Daemon";
+    jobs.smartd = {
+        description = "S.M.A.R.T. Daemon";
 
         environment.TZ = config.time.timeZone;
 
         startOn = "started syslogd";
 
-        daemonType = "daemon";
-
-        exec = "${pkgs.smartmontools}/sbin/smartd --pidfile=/var/run/smartd.pid ${smartdFlags}";
+        exec = "${pkgs.smartmontools}/sbin/smartd --no-fork --pidfile=/var/run/smartd.pid ${smartdFlags}";
       };
 
   };