From bdc6e0549839c4d15ea1e63d98ccec55d8ba4bc8 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Jan 13 2016 10:51:16 +0000
Subject: Update vncserver systemd service file (bz#1211789)


---

diff --git a/tigervnc.spec b/tigervnc.spec
index 20fca6f..bfb8f5e 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -354,6 +354,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jan 13 2016 Jan Grulich <jgrulich@redhat.com> - 1.6.0-2
+- Update systemd service file
+  Resolves: bz#1211789
+
 * Mon Jan 04 2016 Jan Grulich <jgrulich@redhat.com> - 1.6.0-1
 - Update to 1.6.0
 
diff --git a/vncserver.service b/vncserver.service
index 5130c44..efff527 100644
--- a/vncserver.service
+++ b/vncserver.service
@@ -2,8 +2,8 @@
 #
 # Quick HowTo:
 # 1. Copy this file to /etc/systemd/system/vncserver@.service
-# 2. Edit <USER> and vncserver parameters appropriately
-#   ("runuser -l <USER> -c /usr/bin/vncserver %i -arg1 -arg2")
+# 2. Edit User=
+#   ("User=foo")
 # 3. Run `systemctl daemon-reload`
 # 4. Run `systemctl enable vncserver@:<display>.service`
 #
@@ -35,11 +35,13 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
+User=
+
 # Clean any existing files in /tmp/.X11-unix environment
-ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
-ExecStart=/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
+ExecStartPre=-/usr/bin/vncserver -kill %i
+ExecStart=/usr/bin/vncserver %i
 PIDFile=/home/<USER>/.vnc/%H%i.pid
-ExecStop=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
+ExecStop=-/usr/bin/vncserver -kill %i
 
 [Install]
 WantedBy=multi-user.target