From bdbba026f3f98e26509c21823a00de99af78b9c1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 14 Oct 2017 14:42:29 +0800
Subject: [PATCH] Revert "dnsmasq nixos: make sure it always runs"

This reverts commit 1917e69b546bc357652a3fd888c064e2a1c9fed8.
---
 nixos/modules/services/networking/dnsmasq.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 91a3e54474ac..fcf5aa5f175b 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -55,14 +55,6 @@ in
         '';
       };
 
-      alwaysKeepRunning = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error.
-        '';
-      };
-
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -109,12 +101,10 @@ in
           BusName = "uk.org.thekelleys.dnsmasq";
           ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          PrivateTmp = true;
-          ProtectSystem = true;
-          ProtectHome = true;
-          Restart = if cfg.alwaysKeepRunning then "always" else "on-failure";
         };
         restartTriggers = [ config.environment.etc.hosts.source ];
     };
+
   };
+
 }