Use priority 200 for uninstalling the module BZ(1777740) #85
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
zpytela
force-pushed
the
fb-spec-macros
branch
2 times, most recently
from
03a3486
to
7061ef8
Compare
wrabcak
requested changes
Nov 28, 2019
contrib/container-selinux.spec
Outdated
| %relabel_files | ||
| fi | ||
| %selinux_modules_uninstall -s %{selinuxtype} %{modulename} docker | ||
| if %{_sbindir}/selinuxenabled ; then |
There was a problem hiding this comment.
Lines from 111 to 114 are already in the rpm macro.
There was a problem hiding this comment.
I can't see %relabel_files equivalent in the macro.
There was a problem hiding this comment.
there is %selinux_relabel_pre and %selinux_relabel_post which has improved functionality and different design
contrib/container-selinux.spec
Outdated
| @@ -96,7 +96,7 @@ fi | |||
| %{_sbindir}/semodule -n -s %{selinuxtype} -r container 2> /dev/null | |||
| %{_sbindir}/semodule -n -s %{selinuxtype} -d docker 2> /dev/null | |||
| %{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null | |||
| %{_sbindir}/semodule -n -X 200 -s %{selinuxtype} -i $MODULES > /dev/null | |||
| %selinux_modules_install -s %{selinuxtype} $MODULES | |||
| if %{_sbindir}/selinuxenabled ; then | |||
There was a problem hiding this comment.
Load policy process is in macro.
zpytela
force-pushed
the
fb-spec-macros
branch
3 times, most recently
from
d19de5c
to
85f3e4a
Compare
Change the uninstall command in the %postun section of the specfile to use the %selinux_modules_uninstall macro which uses priority 200. Change the install command in the %post section if the specfile to use the %selinux_modules_install macro. Replace relabel commands with using the %selinux_relabel_pre and %selinux_relabel_post macros. Change formatting so that the lines are vertically aligned in the %postun section.
zpytela
force-pushed
the
fb-spec-macros
branch
from
85f3e4a
to
6ee4ce3
Compare
|
@zpytela , Do you have also working scratch build? Thanks, |
|
LGTM |
|
I have updated container-selinux package in Rawhide to use the selinux macros. |
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.
Change the uninstall command in the %postun section of the specfile
to use the %selinux_modules_uninstall macro which uses priority 200.
Change formatting so that the lines are vertically aligned
in the %postun section.