From 98c6c5b730d8b66052b21283c73b1da2429c68fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:26:19 -0400
Subject: [PATCH] fetch-ec2-data: Update for systemd

---
 modules/virtualisation/ec2-data.nix | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 65f40826225..2f58a969492 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -8,21 +8,20 @@ with pkgs.lib;
 
 {
 
-  jobs.fetchEC2Data =
-    { name = "fetch-ec2-data";
+  boot.systemd.services."fetch-ec2-data" =
+    { description = "Fetch EC2 Data";
 
-      startOn = "ip-up";
-
-      task = true;
+      wantedBy = [ "multi-user.target" ];
+      before = [ "sshd.service" ];
 
       path = [ pkgs.curl pkgs.iproute ];
 
       script =
         ''
           ip route del blackhole 169.254.169.254/32 || true
-          
+
           curl="curl --retry 3 --retry-delay 0 --fail"
-        
+
           echo "setting host name..."
           ${optionalString (config.networking.hostName == "") ''
             ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
@@ -60,12 +59,15 @@ with pkgs.lib;
           # accessed from now on.
           ip route add blackhole 169.254.169.254/32
         '';
+
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
     };
 
-  jobs.printHostKey =
-    { name = "print-host-key";
-      task = true;
-      startOn = "started sshd";
+  boot.systemd.services."print-host-key" =
+    { description = "Print SSH Host Key";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "sshd.service" ];
       script =
         ''
           # Print the host public key on the console so that the user
@@ -75,10 +77,8 @@ with pkgs.lib;
           ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
           echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
         '';
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
     };
 
-  # Only start sshd after we've obtained the host key (if given in the
-  # user data), otherwise the sshd job will generate one itself.
-  jobs.sshd.startOn = mkOverride 90 "stopped fetch-ec2-data";
-
 }