From b4bd51448fa8b7574e9a92af50b58da9bb0dfb5e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 28 Apr 2011 05:06:48 +0200 Subject: label: don't print warning when we try ro relabel an non-existing file https://bugzilla.redhat.com/show_bug.cgi?id=698674 --- TODO | 2 ++ src/label.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index d5479b501f..be964623cc 100644 --- a/TODO +++ b/TODO @@ -28,6 +28,8 @@ F15 External: Features: +* plymouth.enable=0 + * introduce dbus calls for enabling/disabling a service * support notifications for services being enabled/disabled diff --git a/src/label.c b/src/label.c index 09ded642fb..43f6e89fa5 100644 --- a/src/label.c +++ b/src/label.c @@ -90,14 +90,14 @@ int label_fix(const char *path, bool ignore_enoent) { /* If the FS doesn't support labels, then exit without warning */ if (r < 0 && errno == ENOTSUP) return 0; - - /* Ignore ENOENT in some cases */ - if (r < 0 && ignore_enoent && errno == ENOENT) - return 0; } } if (r < 0) { + /* Ignore ENOENT in some cases */ + if (ignore_enoent && errno == ENOENT) + return 0; + log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, "Unable to fix label of %s: %m", path); r = security_getenforce() == 1 ? -errno : 0; -- cgit v1.2.3-54-g00ecf