Skip to content
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.

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

Remove unneeded variable reference in FTL run script #1247

Merged
merged 1 commit into from
Dec 10, 2022
Merged

Conversation

PromoFaux
Copy link
Member

@PromoFaux PromoFaux commented Nov 27, 2022

What does this PR aim to accomplish?:

Noted that CAP_STR is empty since 776bac7

Adding in the following on a local build proved it:

echo "-----------------"
echo ${CAP_STR:1}
echo "-----------------"

Outputs:

pihole  | -----------------
pihole  | 
pihole  | -----------------

However, there shouldn't be anything that needs fixing here as the caps are already set further up the script

pihole  |   [i] Applying the following caps to pihole-FTL:
pihole  |         * CAP_CHOWN
pihole  |         * CAP_NET_BIND_SERVICE
pihole  |         * CAP_NET_RAW
pihole  |         * CAP_NET_ADMIN

To note: Currently we are calling:

--inh=${CAP_STR:1} --addamb=${CAP_STR:1}

or - actually

--inh= --addamb=

And nobody has complained it's not working... The conversation around moving the stuff back out into bash_function.sh happened here: #1175 (comment)


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

…that variable back out to bash_functions.sh

The capabilities are already set there, so they do not need to be set again here.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@sonarcloud
Copy link

sonarcloud bot commented Nov 27, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@PromoFaux PromoFaux requested a review from a team November 28, 2022 08:43
@PromoFaux PromoFaux merged commit 1fe6506 into dev Dec 10, 2022
@PromoFaux PromoFaux deleted the tweak/ftlrun branch December 10, 2022 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant