nixos/gdm: use systemd tmpfiles instead of preStart #75893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thet was a mess before. This should be more reliable.
|
For ref the syntax https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html. |
jtojnar
reviewed
Dec 19, 2019
| systemd.tmpfiles.rules = [ | ||
| "d /run/gdm/.config 0711 gdm gdm -" | ||
| ] ++ optionals config.hardware.pulseaudio.enable [ | ||
| "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}" |
There was a problem hiding this comment.
Could we add a comment why is this needed?
There was a problem hiding this comment.
Possibly, but from this diff it looks undercomented. pulseConfig is prominently commented above, I'm not sure this was commented before.
|
@GrahamcOfBorg test gnome3 |
andersk
reviewed
Jan 9, 2020
| "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}" | ||
| ] ++ optionals config.services.gnome3.gnome-initial-setup.enable [ | ||
| # Create stamp file for gnome-initial-setup to prevent it starting in GDM. | ||
| "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm yes" |
There was a problem hiding this comment.
This causes nixos-rebuild switch to fail:
setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration
andersk
added a commit
to andersk/nixpkgs
that referenced
this pull request
Jan 9, 2020
Fixes this error from `nixos-rebuild switch` introduced by NixOS#75893: setting up tmpfiles [/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'. warning: error(s) occurred while switching to the new configuration Signed-off-by: Anders Kaseorg <andersk@mit.edu>
10 tasks
tobim
added a commit
to tobim/nixpkgs
that referenced
this pull request
Feb 16, 2020
Fix the following startup failure of the sound service in the gdm session that was introduced by NixOS#75893: ``` Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] core-util.c: Failed to open configuration file '/run/gdm/.config/pulse//daemon.conf': Not a directory Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] daemon-conf.c: Failed to open configuration file: Not a directory Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Main process exited, code=exited, status=1/FAILURE Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Failed with result 'exit-code'. Feb 16 11:44:15 qp systemd[1380]: Failed to start Sound Service. ```
10 tasks
worldofpeace
added a commit
that referenced
this pull request
Feb 23, 2020
* nixos/gdm: Fix pulseaudio tmpfiles structure Fix the following startup failure of the sound service in the gdm session that was introduced by #75893: ``` Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] core-util.c: Failed to open configuration file '/run/gdm/.config/pulse//daemon.conf': Not a directory Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] daemon-conf.c: Failed to open configuration file: Not a directory Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Main process exited, code=exited, status=1/FAILURE Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Failed with result 'exit-code'. Feb 16 11:44:15 qp systemd[1380]: Failed to start Sound Service. ``` Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
worldofpeace
pushed a commit
that referenced
this pull request
Feb 23, 2020
* nixos/gdm: Fix pulseaudio tmpfiles structure Fix the following startup failure of the sound service in the gdm session that was introduced by #75893: ``` Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] core-util.c: Failed to open configuration file '/run/gdm/.config/pulse//daemon.conf': Not a directory Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] daemon-conf.c: Failed to open configuration file: Not a directory Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Main process exited, code=exited, status=1/FAILURE Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Failed with result 'exit-code'. Feb 16 11:44:15 qp systemd[1380]: Failed to start Sound Service. ``` Co-authored-by: worldofpeace <worldofpeace@protonmail.ch> (cherry picked from commit 44a4a38)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Thet was a mess before. This should be more reliable.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @