Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport gdm fixes #31873

Merged
merged 3 commits into from Nov 29, 2017
Merged

Backport gdm fixes #31873

merged 3 commits into from Nov 29, 2017

Conversation

bjornfor
Copy link
Contributor

Motivation for this change

With these changes, "nixos-rebuild switch" can finally be run without destroying the GNOME desktop session.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@bjornfor bjornfor added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos labels Nov 20, 2017
@jtojnar
Copy link
Contributor

jtojnar commented Nov 20, 2017

Original PR for reference: #31820

@grahamc
Copy link
Member

grahamc commented Nov 24, 2017

@GrahamcOfBorg test gnome3-gdm

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 24, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failure for system: x86_64-linux

error: attribute ‘gnome3-gdm’ in selection path ‘tests.gnome3-gdm’ not found

@grahamc
Copy link
Member

grahamc commented Nov 24, 2017

🤔

#tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; # broken since 2016-10-25

d'oh.

@bjornfor bjornfor force-pushed the backport-gdm-fixes branch 2 times, most recently from 59ccf85 to 0e03dd7 Compare November 25, 2017 21:05
@pierrechevalier83 @orivej
gdm: start gdm on tty7 rather than default tty1
53a7e04 
- Fixes nixos-rebuild switch/test issue with GNOME
  NixOS#21439
- The solution was given here:
  roastiek@d761e66#commitcomment-25382880

(cherry picked from commit 37875c4)
@pierrechevalier83 @orivej
Revert "gdm: don't start getty@tty1 if enabled"
0d3101a 
This commit isn't needed anymore since we now run gdm on tty7.

This reverts commit 440178d.

(cherry picked from commit aed114e)
@pierrechevalier83 @orivej
gdm: remove old workaround for conflicts with getty
52e17a4 
- 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)
@orivej orivej merged commit 6de24bb into NixOS:release-17.09 Nov 29, 2017
@bjornfor bjornfor deleted the backport-gdm-fixes branch November 29, 2017 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg left review comments

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@bjornfor @jtojnar @grahamc @GrahamcOfBorg @orivej @pierrechevalier83