Lower severity of selabel_lookup and matchpathcon failure to log_debug.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 2575b953328f25809af59d319a56b5412f3dbbdc..59f43666b65817fddef3f8ea0936c5ce0970d8f7 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.64 - 
 ===================================
+  Lower severity of selabel_lookup and matchpathcon failure to log_debug.
   Accept multiple mapped device names on many dmsetup command lines.
   Fix dm_udev_wait calls in dmsetup to occur before readahead display not after.
   Include an implicit dm_task_update_nodes() within dm_udev_wait().

diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 00d330dc8dea3178131f45fdb0ed960a7ccc58de..b6fd7251bf3ae598471613b84319cd64c71ff085 100644 (file)
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
        if (!foreground_mode)
                be_daemon(start_timeout);
 
-        dm_prepare_selinux_context(DEFAULT_RUN_DIR, S_IFDIR);
+        (void) dm_prepare_selinux_context(DEFAULT_RUN_DIR, S_IFDIR);
         old_mask = umask(0077);
         if (dm_create_dir(DEFAULT_RUN_DIR) == 0) {
                 DEBUGLOG("clvmd: unable to create %s directory\n",

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 9de2d513ff0e29b9e6762d258419bf07d456ed51..56b9137655bdf41262bf41bdf98819bfb24cd12e 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -400,12 +400,14 @@ static int _selabel_lookup(const char *path, mode_t mode,
        }
 
        if (selabel_lookup(_selabel_handle, scontext, path, mode)) {
-               log_error("selabel_lookup failed: %s", strerror(errno));
+               log_debug("selabel_lookup failed for %s: %s",
+                         path, strerror(errno));
                return 0;
        }
 #else
        if (matchpathcon(path, mode, scontext)) {
-               log_error("matchpathcon failed: %s", strerror(errno));
+               log_debug("matchpathcon failed for %s: %s",
+                         path, strerror(errno));
                return 0;
        }
 #endif