label: don't print warning when we try ro relabel an non-existing file

https://bugzilla.redhat.com/show_bug.cgi?id=698674

diff --git a/TODO b/TODO
index d5479b501fb97d8d4d92eb3f6270ad88c3566810..be964623ccfb08cc599c8234d637934928bcadd4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ F15 External:
 
 Features:
 
 
 Features:
 

+* plymouth.enable=0
+

 * introduce dbus calls for enabling/disabling a service
 
 * support notifications for services being enabled/disabled
 * 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 09ded642fb1d51003230b09e41e484ae0dd48209..43f6e89fa5a1e22bdf30f39195c523ece3714f37 100644 (file)
--- 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;
                         /* 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) {
                 }
         }
 
         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;
                 log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
                          "Unable to fix label of %s: %m", path);
                 r = security_getenforce() == 1 ? -errno : 0;