Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
|---|---|
| This is the <u>official</u> BCLD (Bootable Client Lockdown) Project.<br/>This project is a follow-up to the Fedora BCLD project.<br/>BCLD was initiated in hopes of advancing hardware support and being able to operate in accordance with Secure Boot.<br/>Below are extensive instructions to the product. | <img title="" src="./assets/bcld-logo.png" alt="logo" width="300" data-align="left"> |

**BCLD Version**: 14.2-3 BCLD (Chimera)<br/>
**BCLD Kernel**: 6.14.0-36-generic
**BCLD Version**: 14.2-4 BCLD (Chimera)<br/>
**BCLD Kernel**: 6.14.0-37-generic

# Index

Expand Down
4 changes: 2 additions & 2 deletions config/BUILD.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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}"
Expand Down
17 changes: 15 additions & 2 deletions script/Xconfigure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" == '0' ]]; then
# Disable xscreensaver if the value is 0
/usr/bin/echo "BCLD_SCREENSAVER found, but set to: ${BCLD_SCREENSAVER}"
/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!'
Expand Down
4 changes: 2 additions & 2 deletions test/bcld.md5
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
b901f8f3921cc3d098a252057538c5aa ./script/Xconfigure.sh
3f0e4d55a962e4dd009c1ae8c4db7739 ./script/autocert.sh
f6604ec06c9aa1b19247785ed0f280a2 ./script/bcld_app.sh
caeaba6f3ea103a2d0ee5a68b44baa93 ./script/bcld_vendor.sh
Expand Down
2 changes: 1 addition & 1 deletion test/md5sum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eafe14e0bf4476b39c4dace7bba90040 ./test/bcld.md5
fa197afcde522b9c4ec0e05f425da4ca ./test/bcld.md5
Loading