Skip to content
New issue

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

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

Already on GitHub? # to your account

dist/tools/tapsetup: make compatible with doas #20712

Merged
merged 1 commit into from
May 30, 2024

Conversation

maribu
Copy link
Member

@maribu maribu commented May 30, 2024

Contribution description

doas doesn't set SUDO_USER, but DOAS_USER. This populates SUDO_USER with DOAS_USER if it is empty, so the script works with both doas and sudo.

Testing procedure

sudo dist/tools/tapsetup/tapsetup should still work on systems where sudo is not the doas-sudo-shim but in fact the real legacy sudo tool.

Issues/PRs references

None

`doas` doesn't set `SUDO_USER`, but `DOAS_USER`. This populates
`SUDO_USER` with `DOAS_USER` if it is empty, so the script works with
both doas and sudo.
@maribu maribu added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: tools Area: Supplementary tools labels May 30, 2024
@benpicco benpicco added the CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs label May 30, 2024
@maribu maribu enabled auto-merge May 30, 2024 09:53
@maribu
Copy link
Member Author

maribu commented May 30, 2024

Thx for the quick review :)

@riot-ci
Copy link

riot-ci commented May 30, 2024

Murdock results

✔️ PASSED

d05d33f dist/tools/tapsetup: make compatible with doas

Success Failures Total Runtime
1 0 1 01m:14s

Artifacts

@maribu maribu added this pull request to the merge queue May 30, 2024
Merged via the queue into RIOT-OS:master with commit 230df5f May 30, 2024
30 checks passed
@mguetschow mguetschow added this to the Release 2024.07 milestone Jun 11, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants