From 5a8647aceb33cc4c30f4d2cf6c75b2ab5bf0bab3 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Wed, 17 Jan 2024 13:50:09 -0800
Subject: [PATCH] sync webtop changes

---
 Dockerfile                          | 2 +-
 Dockerfile.aarch64                  | 2 +-
 root/defaults/startwm.sh            | 2 ++
 root/usr/local/bin/wrapped-chromium | 7 ++++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c5cc3d5..884a0e88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-38
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-39
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f118b5de..1e6a2825 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-38
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-39
 
 # set version label
 ARG BUILD_DATE
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index d21b7f45..691a380b 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 /startpulse.sh &
+setterm blank 0
+setterm powerdown 0
 /usr/bin/mate-session > /dev/null 2>&1
diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium
index 58b953c0..02a5e6b9 100755
--- a/root/usr/local/bin/wrapped-chromium
+++ b/root/usr/local/bin/wrapped-chromium
@@ -2,8 +2,13 @@
 
 BIN=/usr/bin/chromium-browser
 
+# Cleanup
+if ! pgrep chromium > /dev/null;then
+  rm -f $HOME/.config/chromium/Singleton*
+fi
+
 # Run normally on privved containers or modified un non priv
-if grep -q 'Seccomp:	0' /proc/1/status; then
+if grep -q 'Seccomp:\t0' /proc/1/status; then
   ${BIN} --password-store=basic "$@"
 else
   ${BIN} --password-store=basic --no-sandbox --test-type "$@"