aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xshare/provision/desktop-basic2
-rwxr-xr-xshare/provision/desktop-full3
-rw-r--r--share/provision/files/desktop-basic/home/user/.custom/xsession2
3 files changed, 3 insertions, 4 deletions
diff --git a/share/provision/desktop-basic b/share/provision/desktop-basic
index 7571a89..6994836 100755
--- a/share/provision/desktop-basic
+++ b/share/provision/desktop-basic
@@ -46,7 +46,7 @@ apps/metadot/metadot deps-bundle desktop-basic
# Additional packages
echo "Installing additional desktop-basic packages..."
-$APT_INSTALL xpra lightdm firejail xsel
+$APT_INSTALL xpra lightdm firejail xsel tigervnc-viewer
# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861744
$APT_INSTALL torbrowser-launcher alsa-utils pulseaudio
diff --git a/share/provision/desktop-full b/share/provision/desktop-full
index e130e05..b4dce46 100755
--- a/share/provision/desktop-full
+++ b/share/provision/desktop-full
@@ -29,9 +29,6 @@ APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
# Provision the basic stuff
$DIRNAME/desktop-basic $HOSTNAME $DOMAIN $MIRROR
-# VNC client
-$APT_INSTALL tigervnc-viewer
-
# Install awesome
apps/metadot/metadot load awesome
apps/metadot/metadot deps awesome
diff --git a/share/provision/files/desktop-basic/home/user/.custom/xsession b/share/provision/files/desktop-basic/home/user/.custom/xsession
index 9450219..57ee5a9 100644
--- a/share/provision/files/desktop-basic/home/user/.custom/xsession
+++ b/share/provision/files/desktop-basic/home/user/.custom/xsession
@@ -37,6 +37,8 @@ sleep 8
# Startup programs
if [ "$HOSTNAME" = "web" ]; then
PROGRAMS="$PROGRAMS tor-browser"
+elif [ "$HOSTNAME" = "vnc" ]; then
+ PROGRAMS="$PROGRAMS"
else
PROGRAMS="$PROGRAMS terminal"
fi