From 6ca8fa89494f7899dd8f902dc56f70d5e228bec6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 15:03:07 +0000
Subject: [PATCH] * Enable Grub support in kdm, i.e., the reboot menu option
 can be used   to directly boot into any of the Grub menu entries.  This
 doesn't   work yet though.  Probably Grub needs some messing with the  
 savedefault option.

svn path=/nixos/trunk/; revision=17091
---
 modules/services/x11/display-managers/kdm.nix | 5 ++++-
 modules/services/x11/xserver.nix              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 8f7a5b5b3fe..e0a85f66f07 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -14,6 +14,9 @@ let
       [Shutdown]
       HaltCmd=${pkgs.upstart}/sbin/halt
       RebootCmd=${pkgs.upstart}/sbin/reboot
+      ${optionalString (config.boot.grubDevice != "") ''
+        BootManager=Grub
+      ''}
 
       [X-*-Core]
       Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
@@ -76,7 +79,7 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
+      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH ${kdebase_workspace}/bin/kdm -config ${kdmrc}";
         logsXsession = true;
       };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 63c7764f75d..cb71a484043 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,7 +384,7 @@ in
             rm -f /tmp/.X0-lock
           '';
 
-        exec = "${cfg.displayManager.job.execCmd}";
+        script = "${cfg.displayManager.job.execCmd}";
       };
 
     services.xserver.displayManager.xserverArgs =