summaryrefslogtreecommitdiff
path: root/src/systemd-nspawn
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-28 00:24:41 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-28 00:24:41 -0400
commite1a4c5422deec7970cc5ce0154fd4fc721ee8dc2 (patch)
treebd93abe325e0a0c8106f24f1f30b5536c00d0290 /src/systemd-nspawn
parentaee084841b875167d9afd4984208fb9a95f89896 (diff)
fix
Diffstat (limited to 'src/systemd-nspawn')
-rw-r--r--src/systemd-nspawn/nspawn-gperf.gperf2
-rw-r--r--src/systemd-nspawn/nspawn-network.c2
-rw-r--r--src/systemd-nspawn/nspawn-patch-uid.c2
-rw-r--r--src/systemd-nspawn/nspawn-register.c4
-rw-r--r--src/systemd-nspawn/nspawn-settings.c2
-rw-r--r--src/systemd-nspawn/nspawn.c14
6 files changed, 13 insertions, 13 deletions
diff --git a/src/systemd-nspawn/nspawn-gperf.gperf b/src/systemd-nspawn/nspawn-gperf.gperf
index 2b5d452662..f814ed8863 100644
--- a/src/systemd-nspawn/nspawn-gperf.gperf
+++ b/src/systemd-nspawn/nspawn-gperf.gperf
@@ -1,6 +1,6 @@
%{
#include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
#include "nspawn-settings.h"
#include "nspawn-expose-ports.h"
%}
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index dd8208633e..98bb3e386f 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -32,7 +32,7 @@
#include "basic/socket-util.h"
#include "basic/stat-util.h"
#include "basic/string-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
#include "basic/util.h"
#define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
diff --git a/src/systemd-nspawn/nspawn-patch-uid.c b/src/systemd-nspawn/nspawn-patch-uid.c
index 91b3c8e7ac..737ffd246e 100644
--- a/src/systemd-nspawn/nspawn-patch-uid.c
+++ b/src/systemd-nspawn/nspawn-patch-uid.c
@@ -26,7 +26,7 @@
#include <sys/vfs.h>
#include <unistd.h>
-#include "acl-util.h"
+#include "shared/acl-util.h"
#include "basic/dirent-util.h"
#include "basic/fd-util.h"
#include "basic/missing.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 4eb0031a39..29e60ca48a 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -20,8 +20,8 @@
#include <systemd/sd-bus.h>
#include "sd-bus/bus-error.h" /* for bus_error_message */
-#include "bus-unit-util.h"
-#include "bus-util.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
#include "nspawn-register.h"
#include "basic/stat-util.h"
#include "basic/strv.h"
diff --git a/src/systemd-nspawn/nspawn-settings.c b/src/systemd-nspawn/nspawn-settings.c
index 2ab881a63f..e5cc385e07 100644
--- a/src/systemd-nspawn/nspawn-settings.c
+++ b/src/systemd-nspawn/nspawn-settings.c
@@ -19,7 +19,7 @@
#include "basic/alloc-util.h"
#include "basic/cap-list.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
#include "nspawn-network.h"
#include "nspawn-settings.h"
#include "basic/parse-util.h"
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index 16558a07e1..fc913a2363 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -48,26 +48,26 @@
#include "basic/alloc-util.h"
#include "basic/barrier.h"
-#include "base-filesystem.h"
+#include "shared/base-filesystem.h"
#include "basic/blkid-util.h"
#include "basic/btrfs-util.h"
#include "basic/cap-list.h"
#include "basic/capability-util.h"
#include "basic/cgroup-util.h"
#include "basic/copy.h"
-#include "dev-setup.h"
+#include "shared/dev-setup.h"
#include "basic/env-util.h"
#include "basic/fd-util.h"
#include "basic/fdset.h"
#include "basic/fileio.h"
#include "basic/formats-util.h"
#include "basic/fs-util.h"
-#include "gpt.h"
+#include "shared/gpt.h"
#include "basic/hostname-util.h"
#include "basic/log.h"
#include "loopback-setup.h"
#include "machine-id-setup.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
#include "basic/macro.h"
#include "basic/missing.h"
#include "basic/mkdir.h"
@@ -84,11 +84,11 @@
#include "basic/parse-util.h"
#include "basic/path-util.h"
#include "basic/process-util.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
#include "basic/random-util.h"
#include "basic/rm-rf.h"
#ifdef HAVE_SECCOMP
-#include "seccomp-util.h"
+#include "shared/seccomp-util.h"
#endif
#include "basic/selinux-util.h"
#include "basic/signal-util.h"
@@ -98,7 +98,7 @@
#include "basic/string-util.h"
#include "basic/strv.h"
#include "basic/terminal-util.h"
-#include "udev-util.h"
+#include "shared/udev-util.h"
#include "basic/umask-util.h"
#include "basic/user-util.h"
#include "basic/util.h"