Fix patching sysctl.conf on FreeBSD. #48087
Merged
Conversation
This file contains 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
In b3c1be2 the lines were stripped of their ending \n, but the \n was never added back to the lines, so calling writelines generates a broken one line file.
garethgreenaway
approved these changes
Jun 14, 2018
garethgreenaway
added a commit
to garethgreenaway/salt
that referenced
this pull request
Nov 1, 2018
rallytime
pushed a commit
that referenced
this pull request
Nov 1, 2018
[2018.3] Backporting #48087 to 2018.3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In b3c1be2 the lines were stripped of their ending \n, but the \n was
never added back to the lines, so calling writelines generates a broken
one line file.
Previous Behavior
Using sysctl.present would change /etc/sysctl.conf to have all its content on one line.
New Behavior
Keep the lines as lines and make it work again.
Tests written?
No
Commits signed with GPG?
Yes