about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authortobim <tobim+github@fastmail.fm>2020-02-23 13:50:19 +0100
committerGitHub <noreply@github.com>2020-02-23 07:50:19 -0500
commit44a4a3839c2255d0801c17638c8427a550686143 (patch)
tree740d225b5b12bbda1d606881f0b892c233a79b93 /nixos
parent65bdc05ae8059fbaac4479eca7a422db9a1e5870 (diff)
downloadnixlib-44a4a3839c2255d0801c17638c8427a550686143.tar
nixlib-44a4a3839c2255d0801c17638c8427a550686143.tar.gz
nixlib-44a4a3839c2255d0801c17638c8427a550686143.tar.bz2
nixlib-44a4a3839c2255d0801c17638c8427a550686143.tar.lz
nixlib-44a4a3839c2255d0801c17638c8427a550686143.tar.xz
nixlib-44a4a3839c2255d0801c17638c8427a550686143.tar.zst
nixlib-44a4a3839c2255d0801c17638c8427a550686143.zip
nixos/gdm: Fix pulseaudio tmpfiles structure (#80274)
* 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>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 325023f4121a..e0ac47bb766d 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -166,9 +166,10 @@ in
       };
 
     systemd.tmpfiles.rules = [
-      "d /run/gdm/.config 0711 gdm gdm -"
+      "d /run/gdm/.config 0711 gdm gdm"
     ] ++ optionals config.hardware.pulseaudio.enable [
-      "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}"
+      "d /run/gdm/.config/pulse 0711 gdm gdm"
+      "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${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"