From 3b4f9d947df5a2bfacc21416da812f81150d4d19 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sat, 27 Jan 2018 20:45:31 +0100 Subject: [PATCH] Wait for plymouth stop before starting x@.service --- Manual.org | 9 +++++++++ roles/yavdr-xorg/tasks/setup-xorg.yml | 5 +++++ roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 diff --git a/Manual.org b/Manual.org index 114d0a5..513166a 100644 --- a/Manual.org +++ b/Manual.org @@ -1717,6 +1717,11 @@ first_run: False src: templates/vdr-xorg.conf dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf +- name: systemd-drop-in | start x@.service after plymouth.service + template: + src: templates/x@service.d/plymouth.conf.j2 + dest: /etc/systemd/system/x@.service.d/plymouth.conf + - name: systemd-drop-in | start x@.service before xlogin@.service template: src: templates/x@service.d/xlogin.conf.j2 @@ -2095,6 +2100,10 @@ Type=forking ExecStart=/usr/bin/x-daemon -logverbose 6 -noreset %I -config /etc/X11/xorg-verbose.conf #+END_SRC ***** Drop-in snippet for x@.service +#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 :mkdirp yes :padline no +[Unit] +After=plymouth.service +#+END_SRC #+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/x@service.d/xlogin.conf.j2 :mkdirp yes :padline no [Unit] Before=xlogin@{{ vdr.user }}.service diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml index e8a2a43..32c1cdf 100644 --- a/roles/yavdr-xorg/tasks/setup-xorg.yml +++ b/roles/yavdr-xorg/tasks/setup-xorg.yml @@ -15,6 +15,11 @@ src: templates/vdr-xorg.conf dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf +- name: systemd-drop-in | start x@.service after plymouth.service + template: + src: templates/x@service.d/plymouth.conf.j2 + dest: /etc/systemd/system/x@.service.d/plymouth.conf + - name: systemd-drop-in | start x@.service before xlogin@.service template: src: templates/x@service.d/xlogin.conf.j2 diff --git a/roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 b/roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 new file mode 100644 index 0000000..1c9d522 --- /dev/null +++ b/roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 @@ -0,0 +1,2 @@ +[Unit] +After=plymouth.service