diff --git a/CHANGELOG.md b/CHANGELOG.md index ca41af9..babb4ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,24 @@ ## 2025 +## December +* `2025-12-02 13:37:30` : [OAC-1261] Changed DSP configuration parameter in [BCLD config](./config/bcld/bcld.cfg) back to: `snd_intel_dspcfg.dsp_driver=1` + * Original parameter was with underscores + * Hyphen notation was for convience but create confusion + * Added extra parameters for [OAC-1353]: + * `i915.enable_psr=0`, + * `i915.enable_dc=0`, and + * `intel_iommu=igfx_off` + * Minor kernel patch: `6.14.0-33` --> `6.14.0-36` + +## November +* `2025-11-20 16:28:45` : Added `xscreensaver` to [REQUIRED](./config/packages/REQUIRED) packages + * Screen will now blank after 15 minutes by default + * Can be customized with new BCLD parameter: [BCLD Display Screensaver](./config/bash/environment) + ## October -* `2025-10-31 16:39:50` : Changed DSP configuration paramter in [BCLD config](./config/bcld/bcld.cfg) to: `snd-intel-dspcfg.dsp_driver=1` - * Parameters was displayed with underscores instead of hyphens +* `2025-10-31 16:39:50` : Changed DSP configuration parameter in [BCLD config](./config/bcld/bcld.cfg) to: `snd-intel-dspcfg.dsp_driver=1` + * Parameter was displayed with underscores instead of hyphens * `2025-10-28 16:27:56` : [OAC-1313] Added more [logind configurations](./config/logind/10_BCLD-logind.conf), since XF86 controls barely make a difference * Added SOF and NVK monitor to [BCLD TEST](./test/bcld_test.sh) * `2025-10-22 13:12:13` : [OAC-1193] Adding [Mesa and Vulkan drivers](./config/packages/REQUIRED) for Nouveau Vulkan support diff --git a/ISO-builder.sh b/ISO-builder.sh index e1a7404..aef3bde 100755 --- a/ISO-builder.sh +++ b/ISO-builder.sh @@ -520,14 +520,15 @@ function copy_post_configs () { copy_file "${CONFIG_DIR}/network-manager/NetworkManager.conf" "${CHROOT_DIR}/etc/NetworkManager/" copy_file "${CONFIG_DIR}/openbox/autostart" "${CHROOT_DIR}/etc/xdg/openbox/" copy_file "${CONFIG_DIR}/pam/login" "${CHROOT_DIR}/etc/pam.d/login" - copy_file "${CONFIG_DIR}/plymouth/spinner.plymouth" "${CHPLY_DIR}/themes/spinner/spinner.plymouth" copy_file "${CONFIG_DIR}/plymouth/bcld-plymouth.png" "${CHPLY_DIR}/themes/spinner/watermark.png" copy_file "${CONFIG_DIR}/plymouth/bcld-plymouth.png" "${CHPLY_DIR}/ubuntu-logo.png" + copy_file "${CONFIG_DIR}/plymouth/spinner.plymouth" "${CHPLY_DIR}/themes/spinner/spinner.plymouth" copy_file "${CONFIG_DIR}/rsyslog/60-BCLD-rsyslog.conf" "${CHOME_DIR}/60-BCLD-rsyslog.conf" copy_file "${CONFIG_DIR}/rsyslog/70-bcld-log.conf" "${CHOME_DIR}/70-bcld-log.conf" - copy_file "${SCRIPT_DIR}/rsyslogger.sh" "${CHROOT_BIN}" - copy_file "${CONFIG_DIR}/X11/xmodmap/.xmodmap" "${CHOME_DIR}" copy_file "${CONFIG_DIR}/X11/xbindkeys/.xbindkeysrc" "${CHOME_DIR}" + copy_file "${CONFIG_DIR}/X11/xmodmap/.xmodmap" "${CHOME_DIR}" + copy_file "${CONFIG_DIR}/X11/xscreensaver/.xscreensaver" "${CHOME_DIR}" + copy_file "${SCRIPT_DIR}/rsyslogger.sh" "${CHROOT_BIN}" ## Copy ISOLINUX copy_file /usr/lib/ISOLINUX/isolinux.bin "${ISOLINUX_DIR}/isolinux.bin" diff --git a/README.md b/README.md index 7dcc9cd..ceb1e49 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.1-7 BCLD (Balrog)
-**BCLD Kernel**: 6.14.0-33-generic +**BCLD Version**: 14.2-2 BCLD (Chimera)
+**BCLD Kernel**: 6.14.0-36-generic # Index diff --git a/config/BUILD.conf b/config/BUILD.conf index 602c27c..54173fb 100644 --- a/config/BUILD.conf +++ b/config/BUILD.conf @@ -57,13 +57,13 @@ # BUILD ENVs: export APP_DIR="./app/${BCLD_MODEL^^}" export BCLD_ARCH='amd64' -export BCLD_CODE_NAME='Balrog' +export BCLD_CODE_NAME='Chimera' 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='7' # Changes with every major feature update -export BCLD_RELEASE='14.1' +export BCLD_PATCH='2' # Changes with every major feature update +export BCLD_RELEASE='14.2' export BCLD_REPO_BRANCH='main' export BCLD_TERM='xterm-256color' export BCLD_TRUSTARGS="u,u,u" @@ -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-33' +export KERNEL_PATCH='0-36' export LC_ALL="C" export NVIDIA_DRIVER="580" export REPO_NAME="${BCLD_CODE_NAME^^}-${BCLD_RELEASE}-${BCLD_PATCH}" diff --git a/config/X11/xscreensaver/.xscreensaver b/config/X11/xscreensaver/.xscreensaver new file mode 100644 index 0000000..9c62aae --- /dev/null +++ b/config/X11/xscreensaver/.xscreensaver @@ -0,0 +1,14 @@ +# XScreenSaver Preferences File +# Written by xscreensaver-settings 6.08 for balrog-test +# https://www.jwz.org/xscreensaver/ + +dialogTheme: borderlessblack +fade: True +fadeSeconds: 0:00:03 +lock: False +mode: blank +nice: 10 +splash: false +splashDuration: 0:00:00 +unfade: True +visualID: default \ No newline at end of file diff --git a/config/bash/environment b/config/bash/environment index 093aecf..9f6b8fd 100644 --- a/config/bash/environment +++ b/config/bash/environment @@ -46,6 +46,7 @@ DISPLAY_PRESET_PARAM='BCLD_PRESET' DISPLAY_RESOLUTION_PARAM='BCLD_RESOLUTION' DISPLAY_ROTATE_PARAM='BCLD_ROTATION' DISPLAY_SCALE_PARAM='BCLD_SCALING' +DISPLAY_SCREENSAVER_PARAM='BCLD_SCREENSAVER' ## NETWORK DEFAULT_INTERFACE_PARAM='BCLD_IF' @@ -90,6 +91,7 @@ DISPLAY_PRESET_ALIAS='bcld.display.preset' DISPLAY_RESOLUTION_ALIAS='bcld.display.resolution' DISPLAY_ROTATE_ALIAS='bcld.display.rotate' DISPLAY_SCALE_ALIAS='bcld.display.scale_factor' +DISPLAY_SCREENSAVER_ALIAS='bcld.display.screensaver' ## NETWORK DEFAULT_INTERFACE_ALIAS='bcld.default.interface' diff --git a/config/bcld/bcld.cfg b/config/bcld/bcld.cfg index 3a22c66..b6779d3 100644 --- a/config/bcld/bcld.cfg +++ b/config/bcld/bcld.cfg @@ -18,6 +18,7 @@ # bcld.display.resolution=(1280x1024, 1368x768, 1600×900, 1920x1080) # bcld.display.rotate=(normal, inverted, left, right) # bcld.display.scale_factor=(10-200) +# bcld.display.screensaver=(0-60) # # (AUDIO) # bcld.audio.alsa_port=(port name) @@ -44,12 +45,15 @@ # (KERNEL) # acpi=off # dis_ucode_ldr +# i915.enable_dc=0 +# i915.enable_psr=0 +# intel_iommu=igfx_off # ip=dhcp # ipv6.disable=1 # noapic # nomodeset # nouveau.modeset=0 # pci=noaer -# snd-intel-dspcfg.dsp_driver=1 +# snd_intel_dspcfg.dsp_driver=1 set bcldparameters="" diff --git a/config/packages/REQUIRED b/config/packages/REQUIRED index 61f2807..442aa32 100644 --- a/config/packages/REQUIRED +++ b/config/packages/REQUIRED @@ -249,6 +249,7 @@ xfonts-cyrillic xfonts-utils xinit xorg +xscreensaver xserver-common xserver-xorg xserver-xorg-core diff --git a/script/Xconfigure.sh b/script/Xconfigure.sh index a0ef8fc..0e1220e 100755 --- a/script/Xconfigure.sh +++ b/script/Xconfigure.sh @@ -210,6 +210,24 @@ if [[ -n "${BCLD_DISPLAY}" ]] && [[ -n "${BCLD_BRIGHTNESS}" ]]; then /usr/bin/xrandr --output "${BCLD_DISPLAY}" --brightness "${BCLD_TRUE_BRIGHTNESS}" fi + +# Screensaver +log_item "Starting XScreenSaver:" + +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 + BCLD_SS_TIMEOUT="0:${BCLD_SCREENSAVER}:00" + /usr/bin/echo "timeout: ${BCLD_SS_TIMEOUT}" >> "${SS_CONFIG}" +else + /usr/bin/echo "timeout: ${DEFAULT_SS_TIMEOUT}" >> "${SS_CONFIG}" +fi + +/usr/bin/xscreensaver & + + log_last 'X settings configured!' # For adding XORG logs to the journal diff --git a/script/startup.sh b/script/startup.sh index 15f0c62..7d73757 100755 --- a/script/startup.sh +++ b/script/startup.sh @@ -169,6 +169,7 @@ function read_all_params() { readparam "${DISPLAY_RESOLUTION_PARAM}" "${DISPLAY_RESOLUTION_ALIAS}" readparam "${DISPLAY_ROTATE_PARAM}" "${DISPLAY_ROTATE_ALIAS}" readparam "${DISPLAY_SCALE_PARAM}" "${DISPLAY_SCALE_ALIAS}" + readparam "${DISPLAY_SCREENSAVER_PARAM}" "${DISPLAY_SCREENSAVER_ALIAS}" ### Network readparam "${DEFAULT_INTERFACE_PARAM}" "${DEFAULT_INTERFACE_ALIAS}" diff --git a/test/bcld.md5 b/test/bcld.md5 index bbedc7c..2f6d460 100644 --- a/test/bcld.md5 +++ b/test/bcld.md5 @@ -6,29 +6,30 @@ b0da6cbaaf9e9d66c2dc962aafda21b4 ./.github/workflows/release.yml 0f9bc2b595325394e775dcdb2f0164da ./.github/workflows/unit-test.yml a1d62bcaf8202e22136ae828daf6b389 ./.gitignore 4a6fa59b1c01aecca6b7504953723f01 ./.gitmodules -8b0b255c8f3b425c7dfe73864c88a5e6 ./CHANGELOG.md +4530536db3f0696154f25cdd992a01d4 ./CHANGELOG.md 04aff3cce210e9c2a8f21df593f07b19 ./COPYING 8b8022ccbc7e2bc33c9cb36b5d5897ce ./Docker-builder.sh ef29c64bd35fec47b154096be5a4c7d0 ./IMG-builder.sh -e12be589b6de0e8dc04644296cec3ce1 ./ISO-builder.sh +65638da7960b4cfc03b3c34809d62561 ./ISO-builder.sh 524b704f7687543521a4f126f3b50422 ./LICENSE.eupl -c1dca9bd10fe755af23c1a18fa475942 ./README.md +eabfebfe5d84844cae23e0668851679c ./README.md f6c4276a99ee9de5b0bc0e385f7f4b57 ./RepoMan.sh b1447f0cf092dc2f9c8770aaedd8fb5f ./SECURITY.md 5ee37144e15f8bf49e7f683935a27f15 ./assets/bcld-logo.png -a1e1eb538cb17598a7f445b6065d18a2 ./config/BUILD.conf +a5cbbf37baaa8eeeefd21d624df0859c ./config/BUILD.conf f9308ddcf62532c70ae0b4970c39b082 ./config/X11/xbindkeys/.xbindkeysrc 2bd011392d7c87070a19a6733fcc03dc ./config/X11/xmodmap/.xmodmap 12e8a46bb563daf82e8ce5fc143cf69b ./config/X11/xorg.conf.d/80-bcld-basic.conf 1dd0fe36979d5936d50b4b6065a41437 ./config/X11/xorg.conf.nvidia/30-nvidia.conf cfc9284e73df9db03f57d490adfa71a2 ./config/X11/xorg.conf.test/99-bcld-disable-kiosk.conf +95ddfee56bb96585866bdf8be8c0d60a ./config/X11/xscreensaver/.xscreensaver 8b637a6c1eb44c49740a1a2d569fe4ad ./config/X11/xterm/XTerm.black 9f5fd90d71fcba2be63627e80f5f7392 ./config/X11/xterm/XTerm.white fb432fece1031f6ae105d1b5f20652a3 ./config/apt/sources.list b7639e4fc5894bb8f36869a867a04f31 ./config/bash/bcld-init -adb9d202bf032bed6680fa1452958938 ./config/bash/environment +49678755247a46feaf67880dc9e95812 ./config/bash/environment 25085e77b1d6fcca2e1064fedf8c7a01 ./config/bash/profile.d/10-BCLD.sh -9ca74fded3984945c806efbddda51730 ./config/bcld/bcld.cfg +a83c978cc7814abf94870b46d457876b ./config/bcld/bcld.cfg 1de846a4704142ca17abda1433e8d0d8 ./config/casper/casper.conf e439cf2b3e72f6df1a93e38bf00dce10 ./config/git/pre-commit d41d8cd98f00b204e9800998ecf8427e ./config/grub/.disk/base_installable @@ -56,7 +57,7 @@ acb938f50e2aa3ac3e0b082c320a1439 ./config/packages/CHROOT 62a3601248c7a5ffa19abbcd416c59a1 ./config/packages/KERNEL 492fba79e914fd8e325dc2fcfd3b00f2 ./config/packages/NVIDIA 6c224b812083575965b9bf1aca105231 ./config/packages/REMOVE -1761c1937ad2012452cd7b72d6387d32 ./config/packages/REQUIRED +4673dbe4403b42f32624d174d99a59b0 ./config/packages/REQUIRED 57f1862c24f16ce5847cd06bf7d64421 ./config/packages/TEST c4194d2bde957994fa74aaa13bc8333e ./config/packages/VIRTUAL e7c3341206da6e77bfed1923d6a11883 ./config/packages/selections.conf @@ -100,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 -cc563f1636e421e28ef0895286a19fce ./script/Xconfigure.sh +5be585ab6953dd5461cd2f22da1861b5 ./script/Xconfigure.sh 3f0e4d55a962e4dd009c1ae8c4db7739 ./script/autocert.sh f6604ec06c9aa1b19247785ed0f280a2 ./script/bcld_app.sh caeaba6f3ea103a2d0ee5a68b44baa93 ./script/bcld_vendor.sh @@ -112,7 +113,7 @@ ae7f9f52e4d6465ccbd9545c91432d7c ./script/echo_tools.sh 582c1f3f44207520fcadc5d49a2efac9 ./script/file_operations.sh 07de693b053c97f6f8d44c43d0ab202b ./script/log_tools.sh 28e9885af3925d9492f72cd9c34f796d ./script/rsyslogger.sh -594de8a69ee29ed44e35dfb37722acec ./script/startup.sh +f89c59426eb93648a4a33fb9470c8dd6 ./script/startup.sh d267254e779d5f15b28f8f79442f707d ./script/usb_logger.sh 4dbccc99d58adefa2e9815705d46c766 ./test/00_BCLD-BUILD.bats 0b1d119254ad08f0c28a1975b28bbc2a ./test/BCLD-BATS.sh diff --git a/test/md5sum b/test/md5sum index c4127fb..f86201e 100644 --- a/test/md5sum +++ b/test/md5sum @@ -1 +1 @@ -d3c724e2a4eb80f527d9db9ca32f0bcb ./test/bcld.md5 +9e0f802c2f5f671ef42d9dba94a5b4ce ./test/bcld.md5