Skip to content

feat: allow local admin to set custom bwrap args #547

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

Draft
HastD wants to merge 1 commit into
base: live
Choose a base branch
from
Draft

feat: allow local admin to set custom bwrap args #547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions build/trivalent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ declare USE_VULKAN="${USE_VULKAN}:false}"

declare FEATURES
declare CHROMIUM_FLAGS
declare BWRAP_EXTRA_ARGS=''

# obtain extra flags that are likely user-configured
# obtain extra flags configured by the local administrator
if [[ -d "/etc/$CHROMIUM_NAME/$CHROMIUM_NAME.conf.d" ]]; then
for conf_file in "/etc/$CHROMIUM_NAME/$CHROMIUM_NAME.conf.d"/*.conf; do
# shellcheck source=/etc/trivalent/trivalent.conf.d/99-example.conf
Expand Down Expand Up @@ -112,7 +113,8 @@ if [[ -r "/etc/ld.so.preload" ]]; then # if the file doesnt exist, bwrap will er
BWRAP_ARGS+=" --ro-bind-try /dev/null /etc/ld.so.preload" # avoid ld preload usage
fi
BWRAP_ARGS+=" --bind $TMPFS_CACHE_DIR $HOME/.cache" # avoid issues with other applications messing with cache
BWRAP_ARGS+=" --setenv GDK_DISABLE icon-nodes" # avoid issues with glycin
BWRAP_ARGS+=" --setenv GDK_DISABLE icon-nodes" # avoid issues with GTK icons
BWRAP_ARGS+=" $BWRAP_EXTRA_ARGS" # add extra args from conf files in trivalent.conf.d

# Do this at the end so that everything else still gets hardened_malloc
declare -rx LD_PRELOAD=""
Expand Down