From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 30 Nov 2018 09:09:00 +0000 (+0100)
Subject: Merge pull request #10996 from poettering/oci-prep
X-Git-Tag: v240~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2ac2b01c8ddaabbe63bcb7168dd752f44320d86;p=thirdparty%2Fsystemd.git

Merge pull request #10996 from poettering/oci-prep

Preparation for the nspawn-OCI work
---

b2ac2b01c8ddaabbe63bcb7168dd752f44320d86
diff --cc src/test/test-stat-util.c
index 2f0538a4bba,4201edac97b..3487ac785d2
--- a/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;