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 patching sysctl.conf on FreeBSD. #48087

Merged
merged 1 commit into from Jun 14, 2018

Conversation

Projects
None yet
3 participants
@mat813
Copy link
Contributor

commented Jun 13, 2018

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

Fix patching sysctl.conf on FreeBSD.
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.

@cachedout cachedout requested a review from garethgreenaway Jun 13, 2018

@rallytime rallytime merged commit 42d88ec into saltstack:develop Jun 14, 2018

6 of 10 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10663 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5692 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19746 — FAILURE
Details
WIP ready for review
Details
codeclimate 1 fixed issue
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25891 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17953 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23622 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22584 — SUCCESS
Details

garethgreenaway added a commit to garethgreenaway/salt that referenced this pull request Nov 1, 2018

rallytime added a commit that referenced this pull request Nov 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.