3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

8 commits

Author SHA1 Message Date
Eelco Dolstra 6ca8fa8949 * 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
2009-09-13 15:03:07 +00:00
Eelco Dolstra 379778c385 * For X logins, don't use pam_ck_connector since it doesn't really
work for X logins.  (The documentation also says so.)  Instead just
  call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
2009-09-13 14:05:21 +00:00
Eelco Dolstra 6596a3ec55 * When using kdm, always use our xsession script, even when the
default session is selected.  This is because we always want to run
  our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
2009-09-13 13:34:52 +00:00
Eelco Dolstra 6e2914fb9b * Make the KDE modules work with KDE 4.2 and 4.3. Also, when using
KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
2009-09-13 11:09:58 +00:00
Sander van der Burg 297889f05c Switched KDE 4.2 to KDE 4.3
svn path=/nixos/trunk/; revision=17043
2009-09-11 10:43:13 +00:00
Eelco Dolstra ecde113c52 * Fix logging out in X. Without this option, the X server dies for
some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
2009-09-10 15:58:39 +00:00
Eelco Dolstra 0156cfbe9e * Cleaned up the display manager module a bit.
svn path=/nixos/trunk/; revision=17012
2009-09-10 15:49:16 +00:00
Eelco Dolstra bc95e0fdf9 * Simplified the X server directory structure: x11/xserver/* -> x11/.
svn path=/nixos/trunk/; revision=17005
2009-09-10 12:50:58 +00:00
Renamed from modules/services/x11/xserver/display-managers/kdm.nix (Browse further)