Use 70-yast.conf instead of 30-yast.conf #995
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
dgdavid
approved these changes
Dec 2, 2019
| @@ -177,6 +177,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2 | |||
| %post | |||
| %{fillup_only -n yast2} | |||
|
|
|||
| if [ -f "/etc/sysctl.d/30-yast.conf" ]; then | |||
| if [ -f "/etc/sysctl.d/70-yast.conf" ]; then | |||
| rm /etc/sysctl.d/30-yast.conf | |||
There was a problem hiding this comment.
From the PR's description
If the 70-yast.conf already exists, the 30-yast.conf will be simply removed (this case should not happen).
If we are sure that it will not happen, I'd simplify this.
Anyway, it looks good to me as it is.
|
✔️ Public Jenkins job #159 successfully finished |
|
✔️ Internal Jenkins job #57 successfully finished |
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.
When writing sysctl related settings, YaST will use
70-yast.confinstead of30-yast.confto reduce the chance of getting its values overridden.During the installation/upgrade of
yast2.rpm, if a30-yast.confis found, it will be renamed to70-yast.conf. If the70-yast.confalready exists, the30-yast.confwill be simply removed (this case should not happen).