From c9ce9b8987789d52390c30f08be0d745acf5ec41 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 10 Jan 2021 03:34:42 +0100 Subject: [PATCH 1/2] use sh for vncserver --- templates/vnc/vncserver.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/vnc/vncserver.service.j2 b/templates/vnc/vncserver.service.j2 index a9083c1..ebfdacf 100644 --- a/templates/vnc/vncserver.service.j2 +++ b/templates/vnc/vncserver.service.j2 @@ -21,7 +21,7 @@ After=syslog.target network.target [Service] Type=forking ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :' -ExecStart=/usr/bin/fish -c "/usr/bin/vncserver %i" +ExecStart=/bin/sh -c "/usr/bin/vncserver %i" ExecStop=/usr/bin/vncserver -kill %i [Install] From 5ad23da9a5948f7924c98a74811040e9b5d34eeb Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 10 Jan 2021 03:48:10 +0100 Subject: [PATCH 2/2] systemd ansible comments --- templates/x11/xsession-reload.service.j2 | 2 ++ templates/x11/xsession.target.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/templates/x11/xsession-reload.service.j2 b/templates/x11/xsession-reload.service.j2 index c6aa5be..bab3942 100644 --- a/templates/x11/xsession-reload.service.j2 +++ b/templates/x11/xsession-reload.service.j2 @@ -1,3 +1,5 @@ +{{ ansible_managed | comment }} + [Unit] Description=X session reload settings PartOf=graphical-session.target diff --git a/templates/x11/xsession.target.j2 b/templates/x11/xsession.target.j2 index a97f5ed..fe426fd 100644 --- a/templates/x11/xsession.target.j2 +++ b/templates/x11/xsession.target.j2 @@ -1,3 +1,5 @@ +{{ ansible_managed | comment }} + [Unit] Description=X session managed by systemd BindsTo=graphical-session.target