1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

Lower severity of selabel_lookup and matchpathcon failure to log_debug.

This commit is contained in:
Peter Rajnoha 2011-03-03 13:05:40 +00:00
parent d75045cfb3
commit eb36643cb7
3 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,6 @@
Version 1.02.64 - 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. Accept multiple mapped device names on many dmsetup command lines.
Fix dm_udev_wait calls in dmsetup to occur before readahead display not after. 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(). Include an implicit dm_task_update_nodes() within dm_udev_wait().

View File

@ -432,7 +432,7 @@ int main(int argc, char *argv[])
if (!foreground_mode) if (!foreground_mode)
be_daemon(start_timeout); 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); old_mask = umask(0077);
if (dm_create_dir(DEFAULT_RUN_DIR) == 0) { if (dm_create_dir(DEFAULT_RUN_DIR) == 0) {
DEBUGLOG("clvmd: unable to create %s directory\n", DEBUGLOG("clvmd: unable to create %s directory\n",

View File

@ -400,12 +400,14 @@ static int _selabel_lookup(const char *path, mode_t mode,
} }
if (selabel_lookup(_selabel_handle, scontext, path, 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; return 0;
} }
#else #else
if (matchpathcon(path, mode, scontext)) { if (matchpathcon(path, mode, scontext)) {
log_error("matchpathcon failed: %s", strerror(errno)); log_debug("matchpathcon failed for %s: %s",
path, strerror(errno));
return 0; return 0;
} }
#endif #endif