summaryrefslogtreecommitdiff
path: root/src/grp-machine
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/grp-machine
parentaee084841b875167d9afd4984208fb9a95f89896 (diff)
fix
Diffstat (limited to 'src/grp-machine')
-rw-r--r--src/grp-machine/libmachine-core/image-dbus.c4
-rw-r--r--src/grp-machine/libmachine-core/machine-dbus.c2
-rw-r--r--src/grp-machine/libmachine-core/machine.c2
-rw-r--r--src/grp-machine/libmachine-core/machined-dbus.c6
-rw-r--r--src/grp-machine/libmachine-core/test-machine-tables.c2
-rw-r--r--src/grp-machine/machinectl/machinectl.c16
-rw-r--r--src/grp-machine/systemd-machined/machined.c4
7 files changed, 18 insertions, 18 deletions
diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c
index e55f419d46..13630fb881 100644
--- a/src/grp-machine/libmachine-core/image-dbus.c
+++ b/src/grp-machine/libmachine-core/image-dbus.c
@@ -19,11 +19,11 @@
#include "basic/alloc-util.h"
#include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/fd-util.h"
#include "image-dbus.h"
#include "basic/io-util.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
#include "basic/process-util.h"
#include "basic/strv.h"
#include "basic/user-util.h"
diff --git a/src/grp-machine/libmachine-core/machine-dbus.c b/src/grp-machine/libmachine-core/machine-dbus.c
index dd6212249b..4e1b92f486 100644
--- a/src/grp-machine/libmachine-core/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/machine-dbus.c
@@ -32,7 +32,7 @@
#include "bus-common-errors.h"
#include "bus-internal.h"
#include "basic/bus-label.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/copy.h"
#include "basic/env-util.h"
#include "basic/fd-util.h"
diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/libmachine-core/machine.c
index 3bcbe9782e..e238983397 100644
--- a/src/grp-machine/libmachine-core/machine.c
+++ b/src/grp-machine/libmachine-core/machine.c
@@ -25,7 +25,7 @@
#include "basic/alloc-util.h"
#include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/escape.h"
#include "basic/extract-word.h"
#include "basic/fd-util.h"
diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c
index 9346ad6a77..7b6d8f77ac 100644
--- a/src/grp-machine/libmachine-core/machined-dbus.c
+++ b/src/grp-machine/libmachine-core/machined-dbus.c
@@ -26,7 +26,7 @@
#include "basic/alloc-util.h"
#include "basic/btrfs-util.h"
#include "bus-common-errors.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/cgroup-util.h"
#include "basic/fd-util.h"
#include "basic/formats-util.h"
@@ -34,8 +34,8 @@
#include "image-dbus.h"
#include "basic/io-util.h"
#include "machine-dbus.h"
-#include "machine-image.h"
-#include "machine-pool.h"
+#include "shared/machine-image.h"
+#include "shared/machine-pool.h"
#include "machined.h"
#include "basic/path-util.h"
#include "basic/process-util.h"
diff --git a/src/grp-machine/libmachine-core/test-machine-tables.c b/src/grp-machine/libmachine-core/test-machine-tables.c
index f851a4d37d..4f87a7d06b 100644
--- a/src/grp-machine/libmachine-core/test-machine-tables.c
+++ b/src/grp-machine/libmachine-core/test-machine-tables.c
@@ -18,7 +18,7 @@
***/
#include "machine.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
int main(int argc, char **argv) {
test_table(machine_class, MACHINE_CLASS);
diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c
index f57cbc1e77..30a0668f75 100644
--- a/src/grp-machine/machinectl/machinectl.c
+++ b/src/grp-machine/machinectl/machinectl.c
@@ -33,26 +33,26 @@
#include "basic/alloc-util.h"
#include "bus-error.h"
-#include "bus-unit-util.h"
-#include "bus-util.h"
-#include "cgroup-show.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
#include "basic/cgroup-util.h"
#include "basic/copy.h"
#include "basic/env-util.h"
#include "basic/fd-util.h"
#include "basic/hostname-util.h"
-#include "import-util.h"
+#include "shared/import-util.h"
#include "basic/log.h"
-#include "logs-show.h"
+#include "shared/logs-show.h"
#include "basic/macro.h"
#include "basic/mkdir.h"
-#include "pager.h"
+#include "shared/pager.h"
#include "basic/parse-util.h"
#include "basic/path-util.h"
#include "basic/process-util.h"
-#include "ptyfwd.h"
+#include "shared/ptyfwd.h"
#include "basic/signal-util.h"
-#include "spawn-polkit-agent.h"
+#include "shared/spawn-polkit-agent.h"
#include "basic/strv.h"
#include "basic/terminal-util.h"
#include "basic/unit-name.h"
diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c
index 1c79c2a71b..ae83e116bb 100644
--- a/src/grp-machine/systemd-machined/machined.c
+++ b/src/grp-machine/systemd-machined/machined.c
@@ -25,14 +25,14 @@
#include "basic/alloc-util.h"
#include "bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/cgroup-util.h"
#include "basic/dirent-util.h"
#include "basic/fd-util.h"
#include "basic/formats-util.h"
#include "basic/hostname-util.h"
#include "basic/label.h"
-#include "machine-image.h"
+#include "shared/machine-image.h"
#include "machined.h"
#include "basic/signal-util.h"