[patch] use vncsession to start the server

tigervnc_files.patch (text/plain), 1.90 KB, created by Roberto Castagnola on 2020-12-04 01:25:27 UTC

diff -ru /usr/portage/net-misc/tigervnc/files/tigervnc.confd /mnt/portage/overlays/net-misc/tigervnc/files/tigervnc.confd
--- /usr/portage/net-misc/tigervnc/files/tigervnc.confd	2015-08-09 02:38:18.000000000 +0200
+++ /mnt/portage/overlays/net-misc/tigervnc/files/tigervnc.confd	2020-12-03 21:32:06.082505060 +0100
@@ -4,6 +4,3 @@
 # example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
 # DISPLAYS="myuser:1"
 
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
-# VNC_OPTS=""
-
diff -ru /usr/portage/net-misc/tigervnc/files/tigervnc.initd /mnt/portage/overlays/net-misc/tigervnc/files/tigervnc.initd
--- /usr/portage/net-misc/tigervnc/files/tigervnc.initd	2017-02-28 21:43:13.000000000 +0100
+++ /mnt/portage/overlays/net-misc/tigervnc/files/tigervnc.initd	2020-12-03 22:20:30.982470387 +0100
@@ -36,23 +36,7 @@
 	checkconfig start || return 1
 	ebegin "Starting TigerVNC server"
 	for user in $DISPLAYS; do
-		usrname=${user%%:*}
-		usropts=VNC_OPTS_${usrname}
-		usrdisp=${user##*:}
-		usrvar=$usropts"["$usrdisp"]"
-		[ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
-
-		# A user may have an invalid shell, so we default to /bin/sh if its the case
-		if [ -x /usr/bin/getent ] ; then
-			usrshell=`getent passwd ${user%%:*} | cut -d: -f 7`
-			case "$usrshell" in
-				*/bash|*/ksh|*/sh|*/csh|*/tcsh) ;;          
-				*) shell="-s /bin/sh" ;;
-			esac
-			echo $usrshell $shell
-		fi
-
-		su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null
+		vncsession ${user%%:*} :${user##*:}
 	done
 	eend $?
 }
@@ -61,7 +45,7 @@
 	checkconfig stop || return 2
 	ebegin "Stopping TigerVNC server"
 	for user in $DISPLAYS; do
-		su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
+		start-stop-daemon --stop --pidfile /var/run/vncsession-:${user##*:}.pid
 	done
 	eend $?
 }