From 948dd8dd1a3403b0a873d53980fcf137cca260a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 17:26:51 +0100
Subject: [PATCH] Use the upstream (but patched) sysinit.target

---
 modules/system/boot/systemd.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index a0462951d00..f72d15d0129 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -23,7 +23,7 @@ let
   upstreamUnits =
     [ # Targets.
       "basic.target"
-      #"sysinit.target"
+      "sysinit.target"
       "sockets.target"
       "graphical.target"
       "multi-user.target"
@@ -524,17 +524,6 @@ in
       { description = "Security Keys";
       };
 
-    # This is like the upstream sysinit.target, except that it doesn't
-    # depend on local-fs.target and swap.target.  If services need to
-    # be started after some filesystem (local or otherwise) has been
-    # mounted, they should use the RequiresMountsFor option.
-    boot.systemd.targets.sysinit =
-      { description = "System Initialization";
-        after = [ "emergency.service" "emergency.target" ];
-        unitConfig.Conflicts = "emergency.service emergency.target";
-        unitConfig.RefuseManualStart = true;
-      };
-
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets