From 8a0e3d80de489e586ffdc6cfac8d8810dade259b Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 13 Feb 2024 14:53:41 -0800 Subject: [PATCH] reverse full logic to remove on init if not included --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65602d2..edfd1a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -322,7 +322,8 @@ RUN \ ln -s /usr/local/lib/kasmvnc /usr/lib/kasmvncserver && \ echo "**** openbox tweaks ****" && \ sed -i \ - 's/NLIMC/NLMC/g' \ + -e 's/NLIMC/NLMC/g' \ + -e 's|| yes\n|' \ /etc/xdg/openbox/rc.xml && \ echo "**** kasm support ****" && \ mkdir -p /kasmbins && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ed8d4b0..353f96f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -322,7 +322,8 @@ RUN \ ln -s /usr/local/lib/kasmvnc /usr/lib/kasmvncserver && \ echo "**** openbox tweaks ****" && \ sed -i \ - 's/NLIMC/NLMC/g' \ + -e 's/NLIMC/NLMC/g' \ + -e 's|| yes\n|' \ /etc/xdg/openbox/rc.xml && \ echo "**** kasm support ****" && \ mkdir -p /kasmbins && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index 935f643..e71ec9b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -39,9 +39,9 @@ if [[ ! -z ${NO_DECOR+x} ]] && [[ ! -f /decorlock ]]; then fi # Fullscreen everything in openbox unless the user explicitly disables it -if [[ -z ${NO_FULL+x} ]] && [[ ! -f /fulllock ]]; then +if [[ ! -z ${NO_FULL+x} ]] && [[ ! -f /fulllock ]]; then sed -i \ - 's|| yes\n|' \ + '/yes<\/maximized><\/application>/d' \ /etc/xdg/openbox/rc.xml touch /fulllock fi