Merge pull request #10996 from poettering/oci-prep

Preparation for the nspawn-OCI work

diff --cc src/core/mount-setup.c
Simple merge

diff --cc src/nspawn/nspawn-mount.c
Simple merge

diff --cc src/partition/growfs.c
Simple merge

diff --cc src/shared/dissect-image.c
Simple merge

diff --cc src/test/meson.build
Simple merge

diff --cc src/test/test-path-util.c
Simple merge

diff --cc src/test/test-stat-util.c
index 2f0538a4bba0252afa2879fecfa1c12393b9da57,4201edac97bbe47bc09f26d7b8e901c1ba252884..3487ac785d2681e4bdd944b3ba9952c64e7e7535
--- 1/src/test/test-stat-util.c
--- 2/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@@ -9,8 -9,9 +9,9 @@@
  #include "fileio.h"
  #include "macro.h"
  #include "missing.h"
 -#include "mount-util.h"
 +#include "mountpoint-util.h"
  #include "stat-util.h"
+ #include "path-util.h"
  
  static void test_files_same(void) {
          _cleanup_close_ int fd = -1;

diff --cc src/tmpfiles/tmpfiles.c
Simple merge