From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Nov 2016 17:38:06 +0000 (+0100)
Subject: nspawn: support ephemeral boots from images
X-Git-Tag: v233.3~155
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=084937b3d7c4da3e3c48d05779f8cfbdc39a2ce6;p=elogind.git

nspawn: support ephemeral boots from images

Previously --ephemeral was only supported with container trees in btrfs
subvolumes (i.e. in combination with --directory=). This adds support for
--ephemeral in conjunction with disk images (i.e. --image=) too.

As side effect this fixes that --ephemeral was accepted but ignored when using
-M on a container that turned out to be an image.

Fixes: #4664
---

diff --git a/src/basic/missing.h b/src/basic/missing.h
index e9438aa90..71a448978 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -146,6 +146,10 @@
 #define GRND_RANDOM 0x0002
 #endif
 
+#ifndef FS_NOCOW_FL
+#define FS_NOCOW_FL 0x00800000
+#endif
+
 #ifndef BTRFS_IOCTL_MAGIC
 #define BTRFS_IOCTL_MAGIC 0x94
 #endif