From 1a67d085bf0c25b7463feca9ac8e8ab1d937e1dd Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Wed, 24 Aug 2022 15:31:55 -0400 Subject: [PATCH 1/3] Reverting change --- 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 0cdb1e0..531faae 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -34,7 +34,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=bash -c 'x11vnc -ncache 10 -display :1 -xkb -forever -shared -repeat -capslock || rm /tmp/.X11-unix/X1 /tmp/.X1-lockfb' +command=x11vnc -ncache 10 -display :1 -xkb -forever -shared -repeat -capslock [program:novnc] priority=25 From 0ea408ce01876eb350c28862f5428540095773cb Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Wed, 24 Aug 2022 15:41:15 -0400 Subject: [PATCH 2/3] Revert "Merge pull request #13 from devindice/Fixing-service-start" This reverts commit 0e6bf445a7ac8830fce66daabcbcccb03aa6374e, reversing changes made to 431aae4a12ade11e9a9d74fee9db5f525f4df2bb. --- rootfs/etc/supervisor/conf.d/supervisord.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index 531faae..c3e680a 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -18,9 +18,9 @@ stderr_logfile=/dev/fd/1 stderr_logfile_maxbytes=0 [group:x] -programs=xfce4,xvfb,x11vnc,novnc,cloud9 +programs=xvfb,lxpanel,x11vnc,novnc,cloud9 -[program:xfce4] +[program:lxpanel] priority=15 directory=%HOME% command=/usr/bin/startxfce4 @@ -34,7 +34,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=x11vnc -ncache 10 -display :1 -xkb -forever -shared -repeat -capslock +command=x11vnc -display :1 -xkb -forever -shared -repeat -capslock [program:novnc] priority=25 @@ -52,4 +52,4 @@ command=bash -c 'while ps aux | grep user-install.sh | grep -v grep 2>&1> /dev/n priority=30 directory=/home/%USER%/.dynamic-background/active user=%USER% -command=bash /usr/share/backgrounds/dynamic.sh \ No newline at end of file +command=bash /usr/share/backgrounds/dynamic.sh From ea1ef10116de8bad5f49935898d0596260214c5b Mon Sep 17 00:00:00 2001 From: Devin Dice Date: Wed, 24 Aug 2022 15:52:13 -0400 Subject: [PATCH 3/3] Revert "Merge pull request #18 from devindice/Reverting-Changes" This reverts commit 6f51e5dd116e72ecb6e7a753e884136ca321fcdd, reversing changes made to 4ba237587d217bf265a786ec3d9f8a48a5d70a53. --- rootfs/etc/supervisor/conf.d/supervisord.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index c3e680a..392cfbc 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -18,9 +18,9 @@ stderr_logfile=/dev/fd/1 stderr_logfile_maxbytes=0 [group:x] -programs=xvfb,lxpanel,x11vnc,novnc,cloud9 +programs=xfce4,xvfb,x11vnc,novnc,cloud9 -[program:lxpanel] +[program:xfce4] priority=15 directory=%HOME% command=/usr/bin/startxfce4 @@ -34,7 +34,7 @@ stopsignal=KILL [program:x11vnc] priority=20 -command=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