From 70aca5974c480e7163a6275a5d5f3ea1e7681593 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Nov 2006 21:03:22 +0000
Subject: [PATCH] * Simplification.

svn path=/nixu/trunk/; revision=7076
---
 test/boot-environment.nix      | 36 +++++++++++++++++++---------------
 test/upstart-jobs/make-job.nix |  7 +++++++
 test/upstart-jobs/mingetty.nix | 12 +++++++-----
 test/upstart-jobs/mingetty.sh  |  3 ---
 test/upstart-jobs/syslogd.nix  | 12 +++++++-----
 test/upstart-jobs/syslogd.sh   |  3 ---
 6 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 test/upstart-jobs/make-job.nix
 delete mode 100644 test/upstart-jobs/mingetty.sh
 delete mode 100644 test/upstart-jobs/syslogd.sh

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 281a6318af0..dcf29322139 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -81,25 +81,29 @@ rec {
   upstartJobs = import ./upstart-jobs/gather.nix {
     inherit (pkgs) stdenv;
 
-    jobs = [
-      # For the builtin logd job.
-      pkgs.upstart 
-
-      # The terminals on ttyX.
-      (map 
-        (ttyNumber: import ./upstart-jobs/mingetty.nix {
-          inherit (pkgs) genericSubstituter;
-          mingetty = pkgs.mingettyWrapper;
-          inherit ttyNumber;
-        })
-        [1 2 3 4 5 6]
-      )
-
+    jobs = map makeJob [
       # Syslogd.
       (import ./upstart-jobs/syslogd.nix {
-        inherit (pkgs) genericSubstituter sysklogd;
+        inherit (pkgs) sysklogd;
       })
-    ];
+    ]
+
+    # The terminals on ttyX.
+    ++ (map 
+      (ttyNumber: makeJob (import ./upstart-jobs/mingetty.nix {
+        mingetty = pkgs.mingettyWrapper;
+        inherit ttyNumber;
+      }))
+      [1 2 3 4 5 6]
+    )
+
+    # For the builtin logd job.
+    ++ [pkgs.upstart];
+  };
+
+  
+  makeJob = import ./upstart-jobs/make-job.nix {
+    inherit (pkgs) stdenv;
   };
 
 
diff --git a/test/upstart-jobs/make-job.nix b/test/upstart-jobs/make-job.nix
new file mode 100644
index 00000000000..3995a8f21aa
--- /dev/null
+++ b/test/upstart-jobs/make-job.nix
@@ -0,0 +1,7 @@
+{stdenv}: job:
+
+stdenv.mkDerivation {
+  inherit (job) name job;
+  builder = builtins.toFile "builder.sh"
+    "source $stdenv/setup; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name";
+}
diff --git a/test/upstart-jobs/mingetty.nix b/test/upstart-jobs/mingetty.nix
index 0a38bc66e6a..cdce937535c 100644
--- a/test/upstart-jobs/mingetty.nix
+++ b/test/upstart-jobs/mingetty.nix
@@ -1,8 +1,10 @@
-{genericSubstituter, mingetty, ttyNumber}:
+{mingetty, ttyNumber}:
 
-genericSubstituter {
-  src = ./mingetty.sh;
-  dir = "etc/event.d";
+{
   name = "tty" + toString ttyNumber;
-  inherit mingetty ttyNumber;
+  job = "
+    start on startup
+    stop on shutdown
+    respawn ${mingetty}/sbin/mingetty --noclear tty${toString ttyNumber}
+  ";
 }
diff --git a/test/upstart-jobs/mingetty.sh b/test/upstart-jobs/mingetty.sh
deleted file mode 100644
index f1eab56510c..00000000000
--- a/test/upstart-jobs/mingetty.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-start on startup
-stop on shutdown
-respawn @mingetty@/sbin/mingetty --noclear tty@ttyNumber@
diff --git a/test/upstart-jobs/syslogd.nix b/test/upstart-jobs/syslogd.nix
index fddcea6692f..8f326b0d6cf 100644
--- a/test/upstart-jobs/syslogd.nix
+++ b/test/upstart-jobs/syslogd.nix
@@ -1,8 +1,10 @@
-{genericSubstituter, sysklogd}:
+{sysklogd}:
 
-genericSubstituter {
-  src = ./syslogd.sh;
-  dir = "etc/event.d";
+{
   name = "syslogd";
-  inherit sysklogd;
+  job = "
+    start on startup
+    stop on shutdown
+    respawn ${sysklogd}/sbin/syslogd -n
+  ";
 }
diff --git a/test/upstart-jobs/syslogd.sh b/test/upstart-jobs/syslogd.sh
deleted file mode 100644
index d87d5b30557..00000000000
--- a/test/upstart-jobs/syslogd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-start on startup
-stop on shutdown
-respawn @sysklogd@/sbin/syslogd -n