From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Wed, 28 Mar 2018 10:57:21 +0000 (+0300)
Subject: nspawn: do not insist on locking read-only container on readonly fs (#8589)
X-Git-Tag: v239~467
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8be17c9b136c6884f38dde9e3ec519886ad4c7e0;p=platform%2Fupstream%2Fsystemd.git

nspawn: do not insist on locking read-only container on readonly fs (#8589)
---

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 3a1d7de..faa2eb0 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -877,8 +877,13 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
          * block devices are device local anyway. */
         if (!path_startswith(path, "/dev")) {
                 r = make_lock_file_for(path, operation, &t);
-                if (r < 0)
-                        return r;
+                if (r < 0) {
+                        if ((operation & LOCK_SH) && r == -EROFS)
+                                log_debug_errno(r, "Failed to create shared "
+                                    "lock for %s: %m", path);
+                        else
+                                return r;
+                }
         }
 
         if (p) {