public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Enable Grub support in kdm, i.e., the reboot menu option can be used

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2009-09-13 15:03:07 +00:00
parent 379778c385
commit 6ca8fa8949
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/services/x11/display-managers/kdm.nix
View File

@ -14,6 +14,9 @@ let
[Shutdown] [Shutdown]
HaltCmd=${pkgs.upstart}/sbin/halt HaltCmd=${pkgs.upstart}/sbin/halt
RebootCmd=${pkgs.upstart}/sbin/reboot RebootCmd=${pkgs.upstart}/sbin/reboot
${optionalString (config.boot.grubDevice != "") ''
BootManager=Grub
''}
[X-*-Core] [X-*-Core]
Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
@ -76,7 +79,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.displayManager.job = 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; logsXsession = true;
}; };

2
modules/services/x11/xserver.nix
View File

@ -384,7 +384,7 @@ in
rm -f /tmp/.X0-lock rm -f /tmp/.X0-lock
''; '';
exec = "${cfg.displayManager.job.execCmd}"; script = "${cfg.displayManager.job.execCmd}";
}; };
services.xserver.displayManager.xserverArgs = services.xserver.displayManager.xserverArgs =