core: output unit status output strings to console, only if we actually are changing...

[elogind.git] / src / core / selinux-setup.c

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index 8be97fc4173706916826ad886d953142294136f8..fba915d7da012b4c963998fa6407f78ff2bee656 100644 (file)
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -43,7 +43,7 @@ static int null_log(int type, const char *fmt, ...) {
 }
 #endif
 
 }
 #endif
 

-int selinux_setup(bool *loaded_policy) {
+int mac_selinux_setup(bool *loaded_policy) {

 
 #ifdef HAVE_SELINUX
         int enforce = 0;
 
 #ifdef HAVE_SELINUX
         int enforce = 0;


@@ -84,7 +84,7 @@ int selinux_setup(bool *loaded_policy) {
                 char timespan[FORMAT_TIMESPAN_MAX];
                 char *label;
 
                 char timespan[FORMAT_TIMESPAN_MAX];
                 char *label;
 

-                retest_selinux();
+                mac_selinux_retest();

 
                 /* Transition to the new context */
                 r = mac_selinux_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);
 
                 /* Transition to the new context */
                 r = mac_selinux_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);


@@ -113,7 +113,7 @@ int selinux_setup(bool *loaded_policy) {
 
                 if (enforce > 0) {
                         if (!initialized) {
 
                 if (enforce > 0) {
                         if (!initialized) {

-                                log_error("Failed to load SELinux policy. Freezing.");
+                                log_emergency("Failed to load SELinux policy.");

                                 return -EIO;
                         }
 
                                 return -EIO;
                         }