From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Apr 2015 14:56:51 +0000 (+0200)
Subject: nspawn: don't inherit read-only flag from disk image if --ephemeral is used
X-Git-Tag: v220~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aee327b8169670986f6a48acbd5ffe1355bfcf27;p=thirdparty%2Fsystemd.git

nspawn: don't inherit read-only flag from disk image if --ephemeral is used

When --ephemeral is used there's no need to keep the image read-only, so
let's not do that then.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 1a9b3be5ecb..f43ffd97c51 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3607,7 +3607,8 @@ static int determine_names(void) {
                         if (r < 0)
                                 return log_error_errno(r, "Invalid image directory: %m");
 
-                        arg_read_only = arg_read_only || i->read_only;
+                        if (!arg_ephemeral)
+                                arg_read_only = arg_read_only || i->read_only;
                 } else
                         arg_directory = get_current_dir_name();