Skip to content

Develop/oac 1325 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbbletterman merged 2 commits into from
Dec 15, 2025
Merged

Develop/oac 1325 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
054ff3c
make disable epxlicit
jbbletterman Dec 12, 2025
1b99593
fix 0 setting
jbbletterman Dec 12, 2025
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
17 changes: 15 additions & 2 deletions script/Xconfigure.sh
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion test/bcld.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eafe14e0bf4476b39c4dace7bba90040 ./test/bcld.md5
8c16026525c4068066caa35e9048175b ./test/bcld.md5
Loading