From acde285c69d4a265689621b47b8b3cb083057389 Mon Sep 17 00:00:00 2001 From: Lon Hohberger Date: Tue, 25 Oct 2016 14:31:32 -0400 Subject: [PATCH] Make 'module' directives match filenames As of the following upstream commit to checkpolicy, compiling policy modules with filenames which differ from the module directive will fail: https://github.com/SELinuxProject/selinux/commit/c6acfae4bc22586ad1dc259b0aad57fa6c5b43ef This patch makes the policy filenames match the module directive in the policy file, resolving the issue. Change-Id: I5730bc51658bb886eacedd8af2c6251e1f8387f5 Closes-bug: 1636613 Signed-off-by: Lon Hohberger (cherry picked from commit 3648c68a22b09bf0fc0604dba4f227ac3f3fbd75) --- elements/selinux/custom-policies/tripleo-selinux-mariadb.te | 2 +- elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elements/selinux/custom-policies/tripleo-selinux-mariadb.te b/elements/selinux/custom-policies/tripleo-selinux-mariadb.te index 890e552a4..f0a93496b 100644 --- a/elements/selinux/custom-policies/tripleo-selinux-mariadb.te +++ b/elements/selinux/custom-policies/tripleo-selinux-mariadb.te @@ -1,5 +1,5 @@ -module tripleo_selinux_mariadb 1.0; +module tripleo-selinux-mariadb 1.0; require { type haproxy_t; diff --git a/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te b/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te index 1d3531ada..b026c4b3f 100644 --- a/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te +++ b/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te @@ -1,5 +1,5 @@ -module tripleo_selinux_rabbitmq 1.0; +module tripleo-selinux-rabbitmq 1.0; require { type rabbitmq_var_lib_t;