From 56da3e78875f783db7451229bf55aa755c386c94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jan 2007 21:34:30 +0000
Subject: [PATCH] * Allow any login program to be specified.

svn path=/nixos/trunk/; revision=7575
---
 system/upstart.nix        | 3 ++-
 upstart-jobs/mingetty.nix | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 8c134a2f0b8..f93098478b7 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -123,8 +123,9 @@ import ../upstart-jobs/gather.nix {
   # The terminals on ttyX.
   ++ (map 
     (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-      inherit (pkgs) mingetty pam_login;
+      inherit (pkgs) mingetty;
       inherit ttyNumber;
+      loginProgram = "${pkgs.pam_login}/bin/login";
     }))
     (config.get ["services" "mingetty" "ttys"])
   )
diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index f67a8ced92c..1d821e789b7 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -1,10 +1,10 @@
-{mingetty, pam_login, ttyNumber}:
+{mingetty, ttyNumber, loginProgram}:
 
 {
   name = "tty" + toString ttyNumber;
   job = "
     start on startup
     stop on shutdown
-    respawn ${mingetty}/sbin/mingetty --loginprog=${pam_login}/bin/login --noclear tty${toString ttyNumber}
+    respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
   ";
 }