This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 43b179cdcb1a7b524f0dc371c43f618552dbff6f (commit)
via 06f9e209238ac351137d0802bceeb48b5e2222f0 (commit)
from 4026984670be8e7308e3de3f82a46f288bebbc41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=43b179cdcb1a7b524f0dc371c43f618552dbff6f
commit 43b179cdcb1a7b524f0dc371c43f618552dbff6f
Author: Roland Mas <[email protected]>
Date: Fri Apr 19 13:40:35 2019 +0200
Fix starting of vncserver?
diff --git a/tests/func_tests-xvnc.sh b/tests/func_tests-xvnc.sh
index 57920b5..2c84c7e 100755
--- a/tests/func_tests-xvnc.sh
+++ b/tests/func_tests-xvnc.sh
@@ -21,11 +21,13 @@ then
if apt show tigervnc-standalone-server > /dev/null ; then
echo "Installing tigervnc-standalone-server and tigervnc-common"
apt-get -y install tigervnc-standalone-server tigervnc-common
+ (echo '$localhost = "no";'
+ echo '1;') >> /etc/vnc.conf
else
echo "Installing legacy vnc4server"
apt-get -y install vnc4server
fi
- apt-get -y install xfonts-base
+ apt-get -y install xfonts-base xterm
fi
if ! type vncserver 2>/dev/null
then
@@ -39,7 +41,7 @@ password
password
EOF
-vncserver :1
+vncserver -xstartup /usr/bin/xterm :1
DISPLAY=:1 $(dirname $0)/func_tests.sh $@
retcode=$?
vncserver -kill :1 || retcode=$?
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=06f9e209238ac351137d0802bceeb48b5e2222f0
commit 06f9e209238ac351137d0802bceeb48b5e2222f0
Author: Roland Mas <[email protected]>
Date: Fri Apr 19 12:55:48 2019 +0200
Let's be less verbose and more explicit
diff --git a/tests/func_tests-xvnc.sh b/tests/func_tests-xvnc.sh
index 40c1d09..57920b5 100755
--- a/tests/func_tests-xvnc.sh
+++ b/tests/func_tests-xvnc.sh
@@ -18,9 +18,11 @@ then
fi
if type apt-get >/dev/null 2>&1
then
- if apt show tigervnc-standalone-server ; then
+ if apt show tigervnc-standalone-server > /dev/null ; then
+ echo "Installing tigervnc-standalone-server and tigervnc-common"
apt-get -y install tigervnc-standalone-server tigervnc-common
else
+ echo "Installing legacy vnc4server"
apt-get -y install vnc4server
fi
apt-get -y install xfonts-base
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests-xvnc.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
