From d9f6bc6ba8d8cbdf0811fd33e90a6fcceac69fac Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 15 Dec 2017 09:25:17 +0100
Subject: [PATCH] Properly initialize tigervnc when started as systemd service

---
 tigervnc.spec     |  5 ++++-
 vncserver.service | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tigervnc.spec b/tigervnc.spec
index aba8d1a..fc3a3c1 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:           tigervnc
 Version:        1.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -331,6 +331,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Dec 15 2017 Jan Grulich <jgrulich@redhat.com> - 1.8.0-5
+- Properly initialize tigervnc when started as systemd service
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/vncserver.service b/vncserver.service
index 45fd823..5077e82 100644
--- a/vncserver.service
+++ b/vncserver.service
@@ -4,7 +4,8 @@
 # 1. Copy this file to /etc/systemd/system/vncserver@.service
 # 2. Replace <USER> with the actual user name and edit vncserver
 #    parameters appropriately
-#   ("User=<USER>" and "/home/<USER>/.vnc/%H%i.pid")
+#    (ExecStart=/usr/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
+#     PIDFile=/home/<USER>/.vnc/%H%i.pid)
 # 3. Run `systemctl daemon-reload`
 # 4. Run `systemctl enable vncserver@:<display>.service`
 #
@@ -36,13 +37,12 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-User=<USER>
 
 # Clean any existing files in /tmp/.X11-unix environment
-ExecStartPre=-/usr/bin/vncserver -kill %i
-ExecStart=/usr/bin/vncserver %i
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
+ExecStart=/usr/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
 PIDFile=/home/<USER>/.vnc/%H%i.pid
-ExecStop=-/usr/bin/vncserver -kill %i
+ExecStop=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
 
 [Install]
 WantedBy=multi-user.target