From 054ff3cacba9c0fb0073e1f4df15300fbaaeea4f Mon Sep 17 00:00:00 2001 From: Joey Boum Bletterman Date: Fri, 12 Dec 2025 14:55:54 +0100 Subject: [PATCH 1/3] make disable epxlicit --- script/Xconfigure.sh | 17 +++++++++++++++-- test/bcld.md5 | 2 +- test/md5sum | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh index 261673e..7f8b9de 100755 --- a/script/Xconfigure.sh +++ b/script/Xconfigure.sh @@ -218,17 +218,30 @@ SS_CONFIG="/home/${USER}/.xscreensaver" DEFAULT_SS_TIMEOUT='0:15:00' # 15 minutes # Set to default unless a BCLD parameter is given -if [[ -n "${BCLD_SCREENSAVER}" ]]; then +if [[ ${BCLD_SCREENSAVER} -eq 0 ]]; then + # Disable xscreensaver if the value is 0 + /usr/bin/echo "BCLD_SCREENSAVER found, but set to: ${BCLD_SS_TIMEOUT}" + /usr/bin/echo "xscreensaver disabled!" + + # Do not start xscreensaver +elif [[ -n "${BCLD_SCREENSAVER}" ]]; then + # If the value is anything else, use that instead BCLD_SS_TIMEOUT="0:${BCLD_SCREENSAVER}:00" /usr/bin/echo "BCLD_SCREENSAVER found!: ${BCLD_SS_TIMEOUT}" /usr/bin/echo -e "\ntimeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}" + + # Start xscreensaver + /usr/bin/xscreensaver & else + # If there is no value, use the default /usr/bin/echo "BCLD_SCREENSAVER not found! Using default: ${DEFAULT_SS_TIMEOUT}" /usr/bin/echo -e "\ntimeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}" + + # Start xscreensaver + /usr/bin/xscreensaver & fi -/usr/bin/xscreensaver & log_last 'X settings configured!' diff --git a/test/bcld.md5 b/test/bcld.md5 index 720bc82..16e43c2 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 -9e2a5b057da738bc2f2cdeb136639d9f ./script/Xconfigure.sh +465e374bc72836c068c82b37b8f00546 ./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 a55b844..f1385bb 100644 --- a/test/md5sum +++ b/test/md5sum @@ -1 +1 @@ -eafe14e0bf4476b39c4dace7bba90040 ./test/bcld.md5 +6ad617f8b99bcc55ef707bee7eb13a08 ./test/bcld.md5 From 1b99593f75bd2cd17091394c348a5b6d13b25408 Mon Sep 17 00:00:00 2001 From: Joey Boum Bletterman Date: Fri, 12 Dec 2025 16:31:21 +0100 Subject: [PATCH 2/3] fix 0 setting --- 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 7f8b9de..19a383c 100755 --- a/script/Xconfigure.sh +++ b/script/Xconfigure.sh @@ -218,9 +218,9 @@ SS_CONFIG="/home/${USER}/.xscreensaver" DEFAULT_SS_TIMEOUT='0:15:00' # 15 minutes # Set to default unless a BCLD parameter is given -if [[ ${BCLD_SCREENSAVER} -eq 0 ]]; then +if [[ "${BCLD_SCREENSAVER}" == '0' ]]; then # Disable xscreensaver if the value is 0 - /usr/bin/echo "BCLD_SCREENSAVER found, but set to: ${BCLD_SS_TIMEOUT}" + /usr/bin/echo "BCLD_SCREENSAVER found, but set to: ${BCLD_SCREENSAVER}" /usr/bin/echo "xscreensaver disabled!" # Do not start xscreensaver diff --git a/test/bcld.md5 b/test/bcld.md5 index 16e43c2..2afd436 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 -465e374bc72836c068c82b37b8f00546 ./script/Xconfigure.sh +b901f8f3921cc3d098a252057538c5aa ./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 f1385bb..4b8c362 100644 --- a/test/md5sum +++ b/test/md5sum @@ -1 +1 @@ -6ad617f8b99bcc55ef707bee7eb13a08 ./test/bcld.md5 +8c16026525c4068066caa35e9048175b ./test/bcld.md5 From fa97e279469601dccb9960602156bcf86723267d Mon Sep 17 00:00:00 2001 From: Joey Boum Bletterman Date: Tue, 16 Dec 2025 12:02:34 +0100 Subject: [PATCH 3/3] Chimera 4 --- README.md | 4 ++-- config/BUILD.conf | 4 ++-- test/bcld.md5 | 2 +- test/md5sum | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3e5898f..8257090 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ |---|---| | This is the official BCLD (Bootable Client Lockdown) Project.
This project is a follow-up to the Fedora BCLD project.
BCLD was initiated in hopes of advancing hardware support and being able to operate in accordance with Secure Boot.
Below are extensive instructions to the product. | logo | -**BCLD Version**: 14.2-3 BCLD (Chimera)
-**BCLD Kernel**: 6.14.0-36-generic +**BCLD Version**: 14.2-4 BCLD (Chimera)
+**BCLD Kernel**: 6.14.0-37-generic # Index diff --git a/config/BUILD.conf b/config/BUILD.conf index 85a8da8..b527e37 100644 --- a/config/BUILD.conf +++ b/config/BUILD.conf @@ -62,7 +62,7 @@ export BCLD_DATE="$(/usr/bin/date +'%d-%b-%Y')" export BCLD_DEFAULT_URL='https://www.google.com/' export BCLD_HOME='/root' export BCLD_MD5="./test/bcld.md5" -export BCLD_PATCH='3' # Changes with every major feature update +export BCLD_PATCH='4' # Changes with every major feature update export BCLD_RELEASE='14.2' export BCLD_REPO_BRANCH='main' export BCLD_TERM='xterm-256color' @@ -75,7 +75,7 @@ export FAT_LABEL="BCLD-USB" export HOME='/root' export KERNEL_MINOR='6.14' export KERNEL_MODEL='generic' -export KERNEL_PATCH='0-36' +export KERNEL_PATCH='0-37' export LC_ALL="C" export NVIDIA_DRIVER="580" export REPO_NAME="${BCLD_CODE_NAME^^}-${BCLD_RELEASE}-${BCLD_PATCH}" diff --git a/test/bcld.md5 b/test/bcld.md5 index 2afd436..090ba83 100644 --- a/test/bcld.md5 +++ b/test/bcld.md5 @@ -16,7 +16,7 @@ cfde01eb893fc8ea1dcbca877ef1f340 ./README.md f6c4276a99ee9de5b0bc0e385f7f4b57 ./RepoMan.sh b1447f0cf092dc2f9c8770aaedd8fb5f ./SECURITY.md 5ee37144e15f8bf49e7f683935a27f15 ./assets/bcld-logo.png -a012375e1b83dfdb563d3609369a3f25 ./config/BUILD.conf +13e8243f0fbc14b8ad8e59051bad917a ./config/BUILD.conf f9308ddcf62532c70ae0b4970c39b082 ./config/X11/xbindkeys/.xbindkeysrc 2bd011392d7c87070a19a6733fcc03dc ./config/X11/xmodmap/.xmodmap 12e8a46bb563daf82e8ce5fc143cf69b ./config/X11/xorg.conf.d/80-bcld-basic.conf diff --git a/test/md5sum b/test/md5sum index 4b8c362..b267b8e 100644 --- a/test/md5sum +++ b/test/md5sum @@ -1 +1 @@ -8c16026525c4068066caa35e9048175b ./test/bcld.md5 +fa197afcde522b9c4ec0e05f425da4ca ./test/bcld.md5