Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: c26342d591b1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6de24bbe9dce
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 29, 2017

  1. gdm: start gdm on tty7 rather than default tty1 

    - Fixes nixos-rebuild switch/test issue with GNOME
  #21439
- The solution was given here:
  roastiek@d761e66#commitcomment-25382880

(cherry picked from commit 37875c4)
    @pierrechevalier83 @orivej
    pierrechevalier83 authored and orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    53a7e04 View commit details
    Browse the repository at this point in the history

  2. Revert "gdm: don't start getty@tty1 if enabled" 

    This commit isn't needed anymore since we now run gdm on tty7.

This reverts commit 440178d.

(cherry picked from commit aed114e)
    @pierrechevalier83 @orivej
    pierrechevalier83 authored and orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    0d3101a View commit details
    Browse the repository at this point in the history

  3. gdm: remove old workaround for conflicts with getty 

    - There used to be a conflict between gdm and getty both trying to
  access tty1
- This conflict was fixed by running gdm on tty7 instead

(cherry picked from commit c46d4da)
    @pierrechevalier83 @orivej
    pierrechevalier83 authored and orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    52e17a4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #31873 from bjornfor/backport-gdm-fixes 

    Backport gdm fixes
    @orivej
    orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    6de24bb View commit details
    Browse the repository at this point in the history