Skip to content

Commit 135adf7

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "selinux permissive on Fedora"
2 parents fcd03d7 + d7967a4 commit 135adf7

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

tools/fixup_stuff.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,18 @@ if [[ ${DISTRO} =~ (precise) ]]; then
8787
fi
8888

8989

90-
# RHEL6
91-
# -----
92-
93-
if [[ $DISTRO =~ (rhel6) ]]; then
94-
90+
if is_fedora; then
9591
# Disable selinux to avoid configuring to allow Apache access
9692
# to Horizon files (LP#1175444)
9793
if selinuxenabled; then
9894
sudo setenforce 0
9995
fi
96+
fi
97+
98+
# RHEL6
99+
# -----
100+
101+
if [[ $DISTRO =~ (rhel6) ]]; then
100102

101103
# If the ``dbus`` package was installed by DevStack dependencies the
102104
# uuid may not be generated because the service was never started (PR#598200),

0 commit comments

Comments
 (0)