From bfca6bd2699b9bd037fc9746ab53f18ac6af0c30 Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Fri, 19 Aug 2022 15:04:01 -0400 Subject: [PATCH 1/4] Fixing service restart --- rootfs/etc/supervisor/conf.d/supervisord.conf | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index df60d06..0351540 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -18,14 +18,7 @@ stderr_logfile=/dev/fd/1 stderr_logfile_maxbytes=0 [group:x] -programs=xvfb,lxpanel,x11vnc,novnc,cloud9 - -[program:lxpanel] -priority=15 -directory=%HOME% -command=/usr/bin/startxfce4 -user=%USER% -environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" +programs=xvfb,x11vnc,novnc,cloud9 [program:xvfb] priority=10 @@ -34,7 +27,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=x11vnc -display :1 -xkb -forever -shared -repeat -capslock +command=bash -c 'rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb; x11vnc -display :1 -xkb -forever -shared -repeat -capslock' [program:novnc] priority=25 From 17f2be6eb28244eafccce3d7e40f0ee76b5826ae Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Fri, 19 Aug 2022 20:52:37 -0400 Subject: [PATCH 2/4] Changing command --- rootfs/etc/supervisor/conf.d/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index 0351540..e9fdedb 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -27,7 +27,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=bash -c 'rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb; x11vnc -display :1 -xkb -forever -shared -repeat -capslock' +command=bash -c 'x11vnc -display :1 -xkb -forever -shared -repeat -capslock || rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb' [program:novnc] priority=25 From 17a69d5dd2c650807dfb9f171a2ea8c586c278ca Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Sat, 20 Aug 2022 12:46:31 -0400 Subject: [PATCH 3/4] Adding xfce4 program --- rootfs/etc/supervisor/conf.d/supervisord.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index e9fdedb..0cdb1e0 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -18,7 +18,14 @@ stderr_logfile=/dev/fd/1 stderr_logfile_maxbytes=0 [group:x] -programs=xvfb,x11vnc,novnc,cloud9 +programs=xfce4,xvfb,x11vnc,novnc,cloud9 + +[program:xfce4] +priority=15 +directory=%HOME% +command=/usr/bin/startxfce4 +user=%USER% +environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" [program:xvfb] priority=10 @@ -27,7 +34,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=bash -c 'x11vnc -display :1 -xkb -forever -shared -repeat -capslock || rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb' +command=bash -c 'x11vnc -ncache 10 -display :1 -xkb -forever -shared -repeat -capslock || rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb' [program:novnc] priority=25 From 8fa51e7d4dc2acf2b9f1504c54371e3188c65395 Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Wed, 24 Aug 2022 14:47:50 -0400 Subject: [PATCH 4/4] Fix Bookmarks --- rootfs/startup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rootfs/startup.sh b/rootfs/startup.sh index 8aded33..677aaaa 100755 --- a/rootfs/startup.sh +++ b/rootfs/startup.sh @@ -127,10 +127,10 @@ mount -a mkdir -p /home/$USER/.config/gtk-3.0 # Keep these bookmarks -grep "file:///home/$USER/Documents" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Documents" >> /home/$USER/.config/gtk-3.0/bookmarks -grep "file:///home/$USER/Workspace" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace" >> /home/$USER/.config/gtk-3.0/bookmarks -grep "file:///home/$USER/Workspace/Shared%20Files" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/-Shared%20Files-" >> /home/$USER/.config/gtk-3.0/bookmarks -grep "file:///home/$USER/Downloads" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Downloads" >> /home/$USER/.config/gtk-3.0/bookmarks +#grep "Documents" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Documents" >> /home/$USER/.config/gtk-3.0/bookmarks +grep "Workspace" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace" >> /home/$USER/.config/gtk-3.0/bookmarks +grep "Shared%20Files" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/-Shared%20Files-" >> /home/$USER/.config/gtk-3.0/bookmarks +grep "Downloads" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Downloads" >> /home/$USER/.config/gtk-3.0/bookmarks grep "127.0.0.1 archive.linux.duke.edu" /etc/hosts || echo "127.0.0.1 archive.linux.duke.edu" >> /etc/hosts