From 12d1cd87ce34095b400c7e8fd62082a743f96a53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 17:32:05 -0400
Subject: [PATCH] Systemd unit names can contain Nix-illegal characters, so
 don't include them

---
 modules/system/boot/systemd.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 3de6220e6b9..2545eaf7393 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -224,28 +224,28 @@ let
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
-            ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
+            ExecStartPre=${makeJobScript "prestart.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.preStart}
             ''}
           ''}
 
           ${optionalString (def.script != "") ''
-            ExecStart=${makeJobScript "${name}.sh" ''
+            ExecStart=${makeJobScript "start.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.script}
             ''}
           ''}
 
           ${optionalString (def.postStart != "") ''
-            ExecStartPost=${makeJobScript "${name}-poststart.sh" ''
+            ExecStartPost=${makeJobScript "poststart.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStart}
             ''}
           ''}
 
           ${optionalString (def.postStop != "") ''
-            ExecStopPost=${makeJobScript "${name}-poststop.sh" ''
+            ExecStopPost=${makeJobScript "poststop.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStop}
             ''}
@@ -311,7 +311,7 @@ let
       ln -s ${cfg.defaultUnit} $out/default.target
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
-      ln -s ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
+      ln -s ../local-fs.target ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
     ''; # */
 
 in