public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Ondrej Mosnacek <omosnace@redhat.com>
To: git-commits@fedoraproject.org
Subject: [tests/selinux] pr775-checkpolicy-revdeps: kernel/selinux-testsuite: hotfix for RHEL-6
Date: Fri, 11 Sep 2026 13:21:23 GMT	[thread overview]
Message-ID: <178913288365.1.4269055346030894935.tests-selinux-2b69b8c34772@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 2b69b8c3477263b059daab7cb578d64a2bda0ef2
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2024-02-15T14:22:25+01:00
            Stats  : +12/-10 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/2b69b8c3477263b059daab7cb578d64a2bda0ef2?branch=pr775-checkpolicy-revdeps

            Log:
            kernel/selinux-testsuite: hotfix for RHEL-6

The install_t workaround for rpm-ostree doesn't work on RHEL-6, so make
it conditional on /run/ostree-booted, so that it is only applied when
necessary.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index a5258dc..1c5e2ce 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -333,17 +333,19 @@ rlJournalStart
         rlRun "sed -i 's/tm\.tv_sec = [0-9]*;/tm.tv_sec = $NETWORK_TIMEOUT;/' ./tests/*/*.c" 0 \
             "Tweak timeout in networking tests" # 2 secs is too little for SCTP test
 
-        # Fixed by https://github.com/fedora-selinux/selinux-policy/pull/2029,
-        # but may not be in all distro streams.
-        rlRun "tee -a policy/test_global.te" 0  \
-            "Work around missing policy rules" <<EOF
-
-            gen_require(\`
-                attribute domain;
-                type install_t;
-            ')
-            allow domain install_t:fd use;
+        if [ -e /run/ostree-booted ]; then
+            # Fixed by https://github.com/fedora-selinux/selinux-policy/pull/2029,
+            # but may not be in all distro streams.
+            rlRun "tee -a policy/test_global.te" 0  \
+                "Work around missing policy rules" <<EOF
+
+                gen_require(\`
+                    attribute domain;
+                    type install_t;
+                ')
+                allow domain install_t:fd use;
 EOF
+        fi
 
         if rlIsRHEL; then
             if kver_lt "3.10.0-349"; then

                 reply	other threads:[~2026-09-11 13:21 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=178913288365.1.4269055346030894935.tests-selinux-2b69b8c34772@fedoraproject.org \
    --to=omosnace@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