From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Dec 2016 23:39:50 +0000 (+0100)
Subject: nspawn: don't complain when we can't fix the timezone of read-only containers
X-Git-Tag: v233~237^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ccf7e9e96ac89f02424c065e39043b5165f8bca;p=thirdparty%2Fsystemd.git

nspawn: don't complain when we can't fix the timezone of read-only containers

There's nothing we can do about it, hence don't complain.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 224d30fca68..5df00df6ed0 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1288,15 +1288,18 @@ static int setup_timezone(const char *dest) {
                 return 0;
         }
 
-        r = unlink(where);
-        if (r < 0 && errno != ENOENT) {
-                log_error_errno(errno, "Failed to remove existing timezone info %s in container: %m", where);
+        if (unlink(where) < 0 && errno != ENOENT) {
+                log_full_errno(IN_SET(errno, EROFS, EACCES, EPERM) ? LOG_DEBUG : LOG_WARNING, /* Don't complain on read-only images */
+                               errno,
+                               "Failed to remove existing timezone info %s in container, ignoring: %m", where);
                 return 0;
         }
 
         what = strjoina("../usr/share/zoneinfo/", z);
         if (symlink(what, where) < 0) {
-                log_error_errno(errno, "Failed to correct timezone of container: %m");
+                log_full_errno(IN_SET(errno, EROFS, EACCES, EPERM) ? LOG_DEBUG : LOG_WARNING,
+                               errno,
+                               "Failed to correct timezone of container, ignoring: %m");
                 return 0;
         }