]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: don't complain when we can't fix the timezone of read-only containers
authorLennart Poettering <lennart@poettering.net>
Tue, 20 Dec 2016 23:39:50 +0000 (00:39 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Dec 2016 18:09:32 +0000 (19:09 +0100)
There's nothing we can do about it, hence don't complain.

src/nspawn/nspawn.c

index 224d30fca681a48c34001d495475665fb8db99ad..5df00df6ed09dcff4bfb219a8aef8249aa65d7fc 100644 (file)
@@ -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;
         }