From 07fd13f20e19f15237253c80aa10ca2f607eb026 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2007 19:32:21 +0000
Subject: [PATCH] Added keyboard layout to options and internal AGPGART option

svn path=/nixos/trunk/; revision=9369
---
 system/options.nix        | 17 +++++++++++++++++
 upstart-jobs/xserver.conf |  1 +
 upstart-jobs/xserver.nix  |  6 ++++++
 3 files changed, 24 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 5971f10d20e7..4e45f34d08c9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -720,6 +720,23 @@
 	";
   }  
 
+  {
+	name = ["services" "xserver" "layout"];
+	default = "us";
+	description ="
+	Keyboard layout.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "useInternalAGPGART"];
+	default = "";
+	example = "no";
+	description ="
+	Just the wrapper for an xorg.conf option.
+	";
+  }  
+
   
   {
     name = ["services" "httpd" "enable"];
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 0a801217888d..52b04f38f0fd 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -79,6 +79,7 @@ Section "Device"
   #Option       "MonitorLayout" "CRT,LFP"
   Option       "MonitorLayout" "LVDS,CRT"
   @device@
+  @internalAGPGART@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index d77d5c04f708..c55f19cc5dcd 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -105,6 +105,12 @@ let
 
 	corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
 
+	internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then
+		"  Option \"UseInternalAGPGART\" \"yes\"" else 
+		if (getCfg "useInternalAGPGART") == "no" then
+		"  Option \"UseInternalAGPGART\" \"no\"" else 
+		"    ");
+
 
     buildCommand = "
       buildCommand= # urgh, don't substitute this