Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ install: install-policies \
install-data

install-policies: policies consolidate-installation
install -d ${INSTPREFIX}/usr/share/selinux/${VARIANT}
install -p -m 644 *.pp.bz2 ${INSTPREFIX}/usr/share/selinux/${VARIANT}/
install -d ${INSTPREFIX}/usr/share/selinux/packages/${VARIANT}
install -p -m 644 *.pp.bz2 ${INSTPREFIX}/usr/share/selinux/packages/${VARIANT}/

install-data: man-pages scripts install-interfaces install-scripts install-manpages

Expand All @@ -105,7 +105,7 @@ install-manpages:
install -m 0644 *.8 ${INSTPREFIX}/usr/share/man/man8/

consolidate-installation:
hardlink -c ${INSTPREFIX}/usr/share/selinux/${VARIANT}/
hardlink -c ${INSTPREFIX}/usr/share/selinux/packages/${VARIANT}/

remote-load:
ifdef HOST
Expand Down
2 changes: 1 addition & 1 deletion common/selinux-disable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ for selinuxvariant in targeted
do
if /usr/sbin/semodule -s \$selinuxvariant -l >/dev/null; then
# Unload policy
/usr/sbin/semodule -s \$selinuxvariant -r $MODULE
/usr/sbin/semodule -X 200 -s \$selinuxvariant -r $MODULE
fi
done
EOF
8 changes: 5 additions & 3 deletions common/selinux-enable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ set +e
for selinuxvariant in targeted
do
if /usr/sbin/semodule -s \$selinuxvariant -l >/dev/null; then
# Load policy
/usr/sbin/semanage module -S \$selinuxvariant \
-a /usr/share/selinux/\${selinuxvariant}/${MODULE}.pp.bz2
# Remove old policy module on priority 400 if it exists
/usr/sbin/semodule -s \$selinuxvariant -r ${MODULE}
# Load new policy module
/usr/sbin/semodule -X 200 -s \$selinuxvariant \
-i /usr/share/selinux/packages/\${selinuxvariant}/${MODULE}.pp.bz2
fi
done
EOF
2 changes: 1 addition & 1 deletion foreman-selinux-disable
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ do
tee -a $LOG | \
/usr/sbin/semanage -S $selinuxvariant -i -
# Unload policy
/usr/sbin/semodule -s $selinuxvariant -r foreman
/usr/sbin/semodule -X 200 -s $selinuxvariant -r foreman
fi
done

Expand Down
5 changes: 4 additions & 1 deletion foreman-selinux-enable
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ do
# Commit changes of deleting the ports
test -s $TMP_EXEC_BEFORE && /usr/sbin/semanage -S $selinuxvariant -i $TMP_EXEC_BEFORE

# Remove old module on priority 400 if it exists
/usr/sbin/semodule -s $selinuxvariant -r foreman &>/dev/null || :

# Load new policy
/usr/sbin/semanage module -S $selinuxvariant -a /usr/share/selinux/${selinuxvariant}/foreman.pp.bz2
/usr/sbin/semodule -X 200 -s $selinuxvariant -i /usr/share/selinux/packages/${selinuxvariant}/foreman.pp.bz2

# Create port list cache
/usr/sbin/semanage port -E > $TMP_PORTS
Expand Down