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

fix: Add -i flag to ignore not known sysctl properties on macOS #465

Open
wants to merge 1 commit into
base: mainline
Choose a base branch
from

Conversation

zaremba-tomasz
Copy link

@zaremba-tomasz zaremba-tomasz commented Aug 25, 2022

*Issue #464 *

Description of changes:
Add -i flag to sysctl call to ignore not recognized oid on M1 chip based Macs.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@@ -27,7 +27,7 @@ import (
)

const (
sysctlCmd = "sysctl"
sysctlCmd = "sysctl -i"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"-i" would go in the args list in collectPlatformDependentInstanceData which is passed as a list. https://github.com/aws/amazon-ssm-agent/pull/465/files#diff-778168ecc0be5e5a65af22002b8f54dbf8396a2cef118de7ea820a5c5c5190f3R53

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review, fixed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we merge this @justinmk3?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have merge rights here. I'll pass this along to the team.

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.

2 participants