rpms/tigervnc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix tigervnc systemd unit file

Browse Source 
Resolves: bz#1583159
This commit is contained in:
Jan Grulich 2018-06-13 12:21:49 +02:00
parent 19607f99f9
commit 577f69313f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.spec
View File

@ -1,6 +1,6 @@
Name: tigervnc Name: tigervnc
Version: 1.8.0 Version: 1.8.0
Release: 9%{?dist} Release: 10%{?dist}
Summary: A TigerVNC remote display system Summary: A TigerVNC remote display system
%global _hardened_build 1 %global _hardened_build 1
@ -321,6 +321,10 @@ install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.c
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Wed Jun 13 2018 Jan Grulich <jgrulich@redhat.com> - 1.8.0-10
- Fix tigervnc systemd unit file
Resolves: bz#1583159
* Wed Jun 06 2018 Adam Jackson <ajax@redhat.com> - 1.8.0-9 * Wed Jun 06 2018 Adam Jackson <ajax@redhat.com> - 1.8.0-9
- Fix GLX initialization with 1.20 - Fix GLX initialization with 1.20

16
vncserver.service
View File

@ -4,8 +4,6 @@
# 1. Copy this file to /etc/systemd/system/vncserver@.service # 1. Copy this file to /etc/systemd/system/vncserver@.service
# 2. Replace <USER> with the actual user name and edit vncserver # 2. Replace <USER> with the actual user name and edit vncserver
# parameters appropriately # parameters appropriately
# (ExecStart=/usr/sbin/runuser -l <USER> -c "/usr/bin/vncserver %i"
# PIDFile=/home/<USER>/.vnc/%H%i.pid)
# 3. Run `systemctl daemon-reload` # 3. Run `systemctl daemon-reload`
# 4. Run `systemctl enable vncserver@:<display>.service` # 4. Run `systemctl enable vncserver@:<display>.service`
# #
@ -37,12 +35,18 @@ After=syslog.target network.target
[Service] [Service]
Type=forking Type=forking
WorkingDirectory=/home/<USER>
User=<USER>
Group=<USER>
# Clean any existing files in /tmp/.X11-unix environment
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 PIDFile=/home/<USER>/.vnc/%H%i.pid
ExecStop=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
ExecStart=/usr/bin/vncserver -autokill %i
ExecStop=/usr/bin/vncserver -kill %i
Restart=on-success
RestartSec=15
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target