From 47648483141c16efb9887d8af27871cee20d25ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Oct 2012 20:29:25 +0100
Subject: [PATCH] Remove some obsolete options

---
 modules/services/ttys/agetty.nix   | 22 ----------------------
 modules/tasks/filesystems.nix      | 10 ----------
 modules/virtualisation/qemu-vm.nix |  2 --
 3 files changed, 34 deletions(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index f79962c1365..444d04564a9 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -10,28 +10,6 @@ with pkgs.lib;
 
     services.mingetty = {
 
-      # FIXME
-      ttys = mkOption {
-        default =
-          if pkgs.stdenv.isArm
-          then [ "ttyS0" ] # presumably an embedded platform such as a plug
-          else [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
-        description = ''
-          The list of tty devices on which to start a login prompt.
-        '';
-      };
-
-      # FIXME: not implemented with systemd
-      waitOnMounts = mkOption {
-        default = false;
-        description = ''
-          Whether the login prompts on the virtual consoles will be
-          started before or after all file systems have been mounted.  By
-          default we don't wait, but if for example your /home is on a
-          separate partition, you may want to turn this on.
-        '';
-      };
-
       greetingLine = mkOption {
         default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \l >>>'';
         description = ''
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 77a43ed15db..774021d0d86 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -145,16 +145,6 @@ in
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
-    boot.ttyEmergency = mkOption {
-      default =
-        if pkgs.stdenv.isArm
-          then "ttyS0" # presumably an embedded platform such as a plug
-        else "tty1";
-      description = ''
-        The tty that will be stopped in case an emergency shell is spawned
-        at boot.
-        '';
-    };
   };
 
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index ec11f3604e7..e3927442821 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -396,8 +396,6 @@ in
       VertRefresh 50-160
     '';
 
-  services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
-
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;