public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Vit Mojzis <vmojzis@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/selinux-policy] f44: Fix disabling modules in "%post minimum"
Date: Fri, 12 Jun 2026 19:10:16 GMT	[thread overview]
Message-ID: <178129141663.1.12766296828127922452.rpms-selinux-policy-61098b7c1092@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/selinux-policy
            Branch : f44
            Commit : 61098b7c109288f759fe85683d895269642ce428
            Author : Vit Mojzis <vmojzis@redhat.com>
            Date   : 2026-06-05T21:25:29+02:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/selinux-policy/c/61098b7c109288f759fe85683d895269642ce428?branch=f44

            Log:
            Fix disabling modules in "%post minimum"

I noticed an oversight in the refactoring of the minimum policy scriptlets in
selinux-policy.spec [0] which happened as part of the merging of -base and
-contrib in [1].

That commit changed the 'contribpackages' variable definition to 'modules':

- contribpackages=`cat %{_datadir}/selinux/minimum/modules-contrib.lst`
- basepackages=`cat %{_datadir}/selinux/minimum/modules-base.lst`
+ modules=`cat %{_datadir}/selinux/minimum/modules.lst`
+ basemodules=`cat %{_datadir}/selinux/minimum/base.lst`

but later changed a use of the 'contribpackages' variable to 'packages':

- for p in $contribpackages; do
+ for p in $packages; do

The $packages variable does not exist, so I don't think this part of the
scriptlet will work.

[0] https://src.fedoraproject.org/rpms/selinux-policy/blob/rawhide/f/selinux-policy.spec
[1] https://src.fedoraproject.org/rpms/selinux-policy/c/28bb9ad7db6eb4a88a5a60365eaecb340fde8f1e

Signed-off-by: Filippo Bonazzi <fbonazzi@suse.de>

---
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 79ac79c..5656255 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -704,7 +704,7 @@ restorecon -R /root /var/log /var/run 2> /dev/null
 semodule -B -s minimum 2> /dev/null
 else
 instpackages=`cat %{_datadir}/selinux/minimum/instmodules.lst`
-for p in $packages; do
+for p in $modules; do
     touch %{_sharedstatedir}/selinux/minimum/active/modules/disabled/$p
 done
 for p in $instpackages apache dbus inetd kerberos mta nis; do

                 reply	other threads:[~2026-06-12 19:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178129141663.1.12766296828127922452.rpms-selinux-policy-61098b7c1092@fedoraproject.org \
    --to=vmojzis@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox