From 6ec6f40c502ef626b60c4b6f42c80d9b354c42af Mon Sep 17 00:00:00 2001
From: Joey Boum Bletterman <jbbletterman@quintor.nl>
Date: Tue, 9 Dec 2025 15:35:27 +0100
Subject: [PATCH 1/3] kill old screensaver

---
 script/Xconfigure.sh | 7 +++++++
 test/bcld.md5        | 4 ++--
 test/md5sum          | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh
index 5c97129..e03841d 100755
--- a/script/Xconfigure.sh
+++ b/script/Xconfigure.sh
@@ -228,6 +228,13 @@ else
     /usr/bin/echo "timeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
 fi
 
+SS_PID="$(/usr/bin/pidof 'xscreensaver')"
+
+if [[ -n "${SS_PID}" ]]; then
+    /usr/bin/echo 'Killing old screensaver...'
+    /usr/bin/pkill 'xscreensaver'
+fi
+
 /usr/bin/xscreensaver &
 
 
diff --git a/test/bcld.md5 b/test/bcld.md5
index edd64e2..b91cd5d 100644
--- a/test/bcld.md5
+++ b/test/bcld.md5
@@ -12,7 +12,7 @@ a1d62bcaf8202e22136ae828daf6b389  ./.gitignore
 ef29c64bd35fec47b154096be5a4c7d0  ./IMG-builder.sh
 65638da7960b4cfc03b3c34809d62561  ./ISO-builder.sh
 524b704f7687543521a4f126f3b50422  ./LICENSE.eupl
-dbdea4a3be2b93ef495c21a01d75527e  ./README.md
+cfde01eb893fc8ea1dcbca877ef1f340  ./README.md
 f6c4276a99ee9de5b0bc0e385f7f4b57  ./RepoMan.sh
 b1447f0cf092dc2f9c8770aaedd8fb5f  ./SECURITY.md
 5ee37144e15f8bf49e7f683935a27f15  ./assets/bcld-logo.png
@@ -101,7 +101,7 @@ bc8d4c92bdbadd1c62c088184f39073f  ./config/trap_shutdown/virt/virt-warning-5.png
 c99677e6deb495fb2b90cbfb84ac7349  ./config/udev/rules.d/BCLD-USB.rules
 87ecdd57738b7ed7fe23e3da8a492593  ./image/ISO/README.diskdefines
 49a4210f52e5bcc79077d12c3dfd63f5  ./image/ISO/isolinux/isolinux.cfg
-25dd76d6889e35fe9800c1465067944a  ./script/Xconfigure.sh
+f253ce09aae41d5c4c02d17cb0f230ce  ./script/Xconfigure.sh
 3f0e4d55a962e4dd009c1ae8c4db7739  ./script/autocert.sh
 f6604ec06c9aa1b19247785ed0f280a2  ./script/bcld_app.sh
 caeaba6f3ea103a2d0ee5a68b44baa93  ./script/bcld_vendor.sh
diff --git a/test/md5sum b/test/md5sum
index 109a070..9bed826 100644
--- a/test/md5sum
+++ b/test/md5sum
@@ -1 +1 @@
-1196c31d71e63647f71b867192dedb4d  ./test/bcld.md5
+5b02cd2c02e0a439c13ba9e4c01cc43c  ./test/bcld.md5

From f223b2bf57230e4ab6d1426b5faa5ed13260d224 Mon Sep 17 00:00:00 2001
From: Joey Boum Bletterman <jbbletterman@quintor.nl>
Date: Tue, 9 Dec 2025 16:56:33 +0100
Subject: [PATCH 2/3] extend echos

---
 script/Xconfigure.sh | 4 ++--
 test/bcld.md5        | 2 +-
 test/md5sum          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh
index e03841d..04441fd 100755
--- a/script/Xconfigure.sh
+++ b/script/Xconfigure.sh
@@ -222,10 +222,10 @@ if [[ -n "${BCLD_SCREENSAVER}" ]]; then
     BCLD_SS_TIMEOUT="0:${BCLD_SCREENSAVER}:00"
 
     /usr/bin/echo "BCLD_SCREENSAVER found!: ${BCLD_SS_TIMEOUT}"
-    /usr/bin/echo "timeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}"
+    /usr/bin/echo -e "\ntimeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}"
 else
     /usr/bin/echo "BCLD_SCREENSAVER not found! Using default: ${DEFAULT_SS_TIMEOUT}"
-    /usr/bin/echo "timeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
+    /usr/bin/echo -e "\ntimeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
 fi
 
 SS_PID="$(/usr/bin/pidof 'xscreensaver')"
diff --git a/test/bcld.md5 b/test/bcld.md5
index b91cd5d..2c63079 100644
--- a/test/bcld.md5
+++ b/test/bcld.md5
@@ -101,7 +101,7 @@ bc8d4c92bdbadd1c62c088184f39073f  ./config/trap_shutdown/virt/virt-warning-5.png
 c99677e6deb495fb2b90cbfb84ac7349  ./config/udev/rules.d/BCLD-USB.rules
 87ecdd57738b7ed7fe23e3da8a492593  ./image/ISO/README.diskdefines
 49a4210f52e5bcc79077d12c3dfd63f5  ./image/ISO/isolinux/isolinux.cfg
-f253ce09aae41d5c4c02d17cb0f230ce  ./script/Xconfigure.sh
+437ea94ab2b165d34aabfa534e19f0c3  ./script/Xconfigure.sh
 3f0e4d55a962e4dd009c1ae8c4db7739  ./script/autocert.sh
 f6604ec06c9aa1b19247785ed0f280a2  ./script/bcld_app.sh
 caeaba6f3ea103a2d0ee5a68b44baa93  ./script/bcld_vendor.sh
diff --git a/test/md5sum b/test/md5sum
index 9bed826..069f7ff 100644
--- a/test/md5sum
+++ b/test/md5sum
@@ -1 +1 @@
-5b02cd2c02e0a439c13ba9e4c01cc43c  ./test/bcld.md5
+7cb5ce580297c4217b796ff69fc2a45b  ./test/bcld.md5

From 15cc509242e54a1ebc6f094346f2d03a933fca49 Mon Sep 17 00:00:00 2001
From: Joey Boum Bletterman <jbbletterman@quintor.nl>
Date: Tue, 9 Dec 2025 17:11:27 +0100
Subject: [PATCH 3/3] no need to kill screen saver, dies with X

---
 script/Xconfigure.sh | 7 -------
 test/bcld.md5        | 2 +-
 test/md5sum          | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh
index 04441fd..261673e 100755
--- a/script/Xconfigure.sh
+++ b/script/Xconfigure.sh
@@ -228,13 +228,6 @@ else
     /usr/bin/echo -e "\ntimeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}"
 fi
 
-SS_PID="$(/usr/bin/pidof 'xscreensaver')"
-
-if [[ -n "${SS_PID}" ]]; then
-    /usr/bin/echo 'Killing old screensaver...'
-    /usr/bin/pkill 'xscreensaver'
-fi
-
 /usr/bin/xscreensaver &
 
 
diff --git a/test/bcld.md5 b/test/bcld.md5
index 2c63079..720bc82 100644
--- a/test/bcld.md5
+++ b/test/bcld.md5
@@ -101,7 +101,7 @@ bc8d4c92bdbadd1c62c088184f39073f  ./config/trap_shutdown/virt/virt-warning-5.png
 c99677e6deb495fb2b90cbfb84ac7349  ./config/udev/rules.d/BCLD-USB.rules
 87ecdd57738b7ed7fe23e3da8a492593  ./image/ISO/README.diskdefines
 49a4210f52e5bcc79077d12c3dfd63f5  ./image/ISO/isolinux/isolinux.cfg
-437ea94ab2b165d34aabfa534e19f0c3  ./script/Xconfigure.sh
+9e2a5b057da738bc2f2cdeb136639d9f  ./script/Xconfigure.sh
 3f0e4d55a962e4dd009c1ae8c4db7739  ./script/autocert.sh
 f6604ec06c9aa1b19247785ed0f280a2  ./script/bcld_app.sh
 caeaba6f3ea103a2d0ee5a68b44baa93  ./script/bcld_vendor.sh
diff --git a/test/md5sum b/test/md5sum
index 069f7ff..a55b844 100644
--- a/test/md5sum
+++ b/test/md5sum
@@ -1 +1 @@
-7cb5ce580297c4217b796ff69fc2a45b  ./test/bcld.md5
+eafe14e0bf4476b39c4dace7bba90040  ./test/bcld.md5