fix: harden-flatpak: add "or" logic to grep search for compatibility with set -e check#921
Merged
RoyalOughtness merged 3 commits intosecureblue:livefrom Mar 15, 2025
Merged
Conversation
…lity with set -e check without this, the command would report an error when it finds no matches on x86_64-v1 hardware.
spaceoden
changed the title
RoyalOughtness
approved these changes
Mar 13, 2025
HastD
approved these changes
Mar 15, 2025
RoyalOughtness
pushed a commit
to RoyalOughtness/secureblue-dev
that referenced
this pull request
Aug 4, 2025
…with set -e check (secureblue#921)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
without this, the compound command containing the grep search would report an error when it finds no matches on x86_64-v1 hardware.
Details:
On x86_64-v1 hardware, ld-linux-x86-64.so.2 doesn't contain the string
(supported, searched). The harden-flatpak code already factors for that: theuarchesandbestuarchvariables will be empty on x86_64-v1 hardware, and theif [ -z "$bestuarch" ]test will pass, running the non-hwcap hardening.Without this PR, grep reports an error (on x86_64-v1 hardware). If
set -eis used on the code (prior to this PR), the grep error will kill this code, preempting the execution of the hardening (on x86_64-v1 hardware).