Fix: provision: debian: xsession startup enhancements

diff --git a/share/provision/debian/files/desktop-basic/home/user/.custom/xsession b/share/provision/debian/files/desktop-basic/home/user/.custom/xsession
index ee206e0769667beaa27128dc23c61addafbe5ab3..157c4e271c644e9e15353099f0eb1d8e9976603c 100644 (file)
--- a/share/provision/debian/files/desktop-basic/home/user/.custom/xsession
+++ b/share/provision/debian/files/desktop-basic/home/user/.custom/xsession
@@ -36,9 +36,13 @@ sleep 8
 
 # Startup programs
 if [ "$HOSTNAME" = "web" ]; then
-  PROGRAMS="$PROGRAMS tor-browser"
+  PROGRAMS="terminal-session-chooser"
+elif [ "$HOSTNAME" = "tor" ]; then
+  PROGRAMS="$PROGRAMS tint2 tor-browser"
 elif [ "$HOSTNAME" = "vnc" ]; then
   PROGRAMS="$PROGRAMS vnc"
+elif [ -e "$HOME/apps/local/startup" ]; then
+  PROGRAMS="$PROGRAMS startup"
 else
   PROGRAMS="$PROGRAMS terminal"
 fi
@@ -46,3 +50,8 @@ fi
 # Fix keyboard layout if needed
 # https://wiki.debian.org/Keyboard
 #setxkbmap -model abnt2 -layout br -variant thinkpad
+
+# Local customizations
+if [ -e "$HOME/.custom/xsession-$HOSTNAME" ]; then
+  . "$HOME/.custom/xsession-$HOSTNAME"
+fi

diff --git a/share/provision/debian/openbox b/share/provision/debian/openbox
index 821369bfbd9f3826424cea1f0df45618104dcfab..5288f4e3a69af6c89af54a50fa3f32fd7b7e178b 100755 (executable)
--- a/share/provision/debian/openbox
+++ b/share/provision/debian/openbox
@@ -38,9 +38,9 @@ fi
 if [ -f "$HOME/.custom/xsession" ]; then
   sed -i -e 's/^WINDOW_MANAGER=.*$/WINDOW_MANAGER="openbox"/' $HOME/.custom/xsession
 
-  echo ""                            > $HOME/.custom/xsession
-  echo '# Custom config'            >> $HOME/.custom/xsession
-  echo 'PROGRAMS="$PROGRAMS tint2"' >> $HOME/.custom/xsession
+  #echo ""                           >> $HOME/.custom/xsession
+  #echo '# Custom config'            >> $HOME/.custom/xsession
+  #echo 'PROGRAMS="$PROGRAMS tint2"' >> $HOME/.custom/xsession
 
   cat <<-EOF > $HOME/.custom/xsession-ready
 #!/bin/bash
@@ -48,7 +48,7 @@ if [ -f "$HOME/.custom/xsession" ]; then
 # xsession-ready: runs after the X11 session is ready
 #
 
-# Fix the background color due to window resize
+# Fix the background color due to window resize in kvmx guests running openbox
 sleep 20
 xsetroot -solid '#1C1C1C'
 EOF