diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/Makefile | 53 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/Makefile (renamed from src/grp-machine/libmachine-core/Makefile) | 41 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/import-common.c (renamed from src/grp-machine/grp-import/systemd-import/import-common.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/import-common.h (renamed from src/grp-machine/grp-import/systemd-import/import-common.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/import-compress.c (renamed from src/grp-machine/grp-import/systemd-import/import-compress.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/import-compress.h (renamed from src/grp-machine/grp-import/systemd-import/import-compress.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/qcow2-util.c (renamed from src/grp-machine/grp-import/qcow2-util.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/qcow2-util.h (renamed from src/grp-machine/grp-import/qcow2-util.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/libimport/test-qcow2.c (renamed from src/grp-machine/grp-import/test-qcow2.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-export/Makefile | 9 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-import/Makefile | 11 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/.gitignore (renamed from src/grp-machine/grp-import/.gitignore) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/Makefile | 32 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.conf (renamed from src/grp-machine/grp-import/org.freedesktop.import1.conf) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.policy.in (renamed from src/grp-machine/grp-import/org.freedesktop.import1.policy.in) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.service (renamed from src/grp-machine/grp-import/org.freedesktop.import1.service) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-pull/Makefile | 11 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-pull/curl-util.c (renamed from src/grp-machine/grp-import/curl-util.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-pull/curl-util.h (renamed from src/grp-machine/grp-import/curl-util.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/.gitignore (renamed from src/grp-machine/libmachine-core/.gitignore) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 23 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/image-dbus.c (renamed from src/grp-machine/libmachine-core/image-dbus.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/image-dbus.h (renamed from src/grp-machine/libmachine-core/image-dbus.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machine-dbus.c (renamed from src/grp-machine/libmachine-core/machine-dbus.c) | 13 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machine-dbus.h (renamed from src/grp-machine/libmachine-core/machine-dbus.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machine.c (renamed from src/grp-machine/libmachine-core/machine.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machine.h (renamed from src/grp-machine/libmachine-core/machine.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machined-dbus.c (renamed from src/grp-machine/libmachine-core/machined-dbus.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machined.c | 3 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/machined.h (renamed from src/grp-machine/libmachine-core/machined.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/operation.c (renamed from src/grp-machine/libmachine-core/operation.c) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/operation.h (renamed from src/grp-machine/libmachine-core/operation.h) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.conf (renamed from src/grp-machine/libmachine-core/org.freedesktop.machine1.conf) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in (renamed from src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/org.freedesktop.machine1.service (renamed from src/grp-machine/libmachine-core/org.freedesktop.machine1.service) | 0 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/test-machine-tables.c (renamed from src/grp-machine/libmachine-core/test-machine-tables.c) | 0 |
38 files changed, 98 insertions, 101 deletions
diff --git a/src/Makefile b/src/Makefile index 255851d7d7..58e747aaff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,7 +31,7 @@ nested.subdirs += grp-initutils nested.subdirs += grp-journal nested.subdirs += grp-locale nested.subdirs += grp-login -#nested.subdirs += grp-machine +nested.subdirs += grp-machine nested.subdirs += grp-network nested.subdirs += grp-resolve nested.subdirs += grp-system diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile index 74a1756ef9..c5225e44b5 100644 --- a/src/grp-machine/Makefile +++ b/src/grp-machine/Makefile @@ -24,7 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk nested.subdirs += machinectl systemd-machined -nested.subdirs += libmachine-core nested.subdirs += nss-mymachines nested.subdirs += grp-import diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile index 46be93c42f..b996bd4c19 100644 --- a/src/grp-machine/grp-import/Makefile +++ b/src/grp-machine/grp-import/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_IMPORTD),) @@ -31,45 +31,11 @@ ifneq ($(HAVE_ZLIB),) ifneq ($(HAVE_BZIP2),) ifneq ($(HAVE_GCRYPT),) -dist_rootlibexec_DATA = \ - src/import/import-pubring.gpg - -nodist_systemunit_DATA += \ - units/systemd-importd.service - -dist_systemunit_DATA_busnames += \ - units/org.freedesktop.import1.busname - -BUSNAMES_TARGET_WANTS += \ - org.freedesktop.import1.busname - -SYSTEM_UNIT_ALIASES += \ - systemd-importd.service dbus-org.freedesktop.import1.service - -dist_dbussystemservice_DATA += \ - src/import/org.freedesktop.import1.service - -dist_dbuspolicy_DATA += \ - src/import/org.freedesktop.import1.conf - -polkitpolicy_files += \ - src/import/org.freedesktop.import1.policy - -manual_tests += \ - test-qcow2 - -test_qcow2_SOURCES = \ - src/import/test-qcow2.c \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h - -test_qcow2_CFLAGS = \ - $(AM_CFLAGS) \ - $(ZLIB_CFLAGS) - -test_qcow2_LDADD = \ - libshared.la \ - $(ZLIB_LIBS) +nested.subdirs += libimport +nested.subdirs += systemd-export +nested.subdirs += systemd-import +nested.subdirs += systemd-importd +nested.subdirs += systemd-pull endif # HAVE_GCRYPT endif # HAVE_BZIP2 @@ -79,11 +45,4 @@ endif # HAVE_LIBCURL endif # ENABLE_IMPORTD -polkitpolicy_in_files += \ - src/import/org.freedesktop.import1.policy.in - -EXTRA_DIST += \ - units/systemd-importd.service.in - - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/grp-import/libimport/Makefile index 3881224746..5691d0bba1 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/grp-import/libimport/Makefile @@ -20,33 +20,32 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -libmachine_core_la_SOURCES = \ - src/machine/machine.c \ - src/machine/machine.h \ - src/machine/machined-dbus.c \ - src/machine/machine-dbus.c \ - src/machine/machine-dbus.h \ - src/machine/image-dbus.c \ - src/machine/image-dbus.h \ - src/machine/operation.c \ - src/machine/operation.h +noinst_LTLIBRARIES += libimport.la -libmachine_core_la_LIBADD = \ - libshared.la +libimport_la_SOURCES = \ + qcow2-util.c \ + import-common.c \ + import-compress.c -noinst_LTLIBRARIES += \ - libmachine-core.la +libimport_la_LIBADD += libbasic.la -test_machine_tables_SOURCES = \ - src/machine/test-machine-tables.c +manual_tests += \ + test-qcow2 -test_machine_tables_LDADD = \ - libmachine-core.la +test_qcow2_SOURCES = \ + src/import/test-qcow2.c \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h -tests += \ - test-machine-tables +test_qcow2_CFLAGS = \ + $(AM_CFLAGS) \ + $(ZLIB_CFLAGS) + +test_qcow2_LDADD = \ + libshared.la \ + $(ZLIB_LIBS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/grp-import/systemd-import/import-common.c b/src/grp-machine/grp-import/libimport/import-common.c index cd69e900ec..cd69e900ec 100644 --- a/src/grp-machine/grp-import/systemd-import/import-common.c +++ b/src/grp-machine/grp-import/libimport/import-common.c diff --git a/src/grp-machine/grp-import/systemd-import/import-common.h b/src/grp-machine/grp-import/libimport/import-common.h index 3abd62e8c3..3abd62e8c3 100644 --- a/src/grp-machine/grp-import/systemd-import/import-common.h +++ b/src/grp-machine/grp-import/libimport/import-common.h diff --git a/src/grp-machine/grp-import/systemd-import/import-compress.c b/src/grp-machine/grp-import/libimport/import-compress.c index 4f1a9891e8..4f1a9891e8 100644 --- a/src/grp-machine/grp-import/systemd-import/import-compress.c +++ b/src/grp-machine/grp-import/libimport/import-compress.c diff --git a/src/grp-machine/grp-import/systemd-import/import-compress.h b/src/grp-machine/grp-import/libimport/import-compress.h index 130afb4cd0..130afb4cd0 100644 --- a/src/grp-machine/grp-import/systemd-import/import-compress.h +++ b/src/grp-machine/grp-import/libimport/import-compress.h diff --git a/src/grp-machine/grp-import/qcow2-util.c b/src/grp-machine/grp-import/libimport/qcow2-util.c index bc50b7d0b3..bc50b7d0b3 100644 --- a/src/grp-machine/grp-import/qcow2-util.c +++ b/src/grp-machine/grp-import/libimport/qcow2-util.c diff --git a/src/grp-machine/grp-import/qcow2-util.h b/src/grp-machine/grp-import/libimport/qcow2-util.h index 6dddac8cdf..6dddac8cdf 100644 --- a/src/grp-machine/grp-import/qcow2-util.h +++ b/src/grp-machine/grp-import/libimport/qcow2-util.h diff --git a/src/grp-machine/grp-import/test-qcow2.c b/src/grp-machine/grp-import/libimport/test-qcow2.c index 15d7c29aef..15d7c29aef 100644 --- a/src/grp-machine/grp-import/test-qcow2.c +++ b/src/grp-machine/grp-import/libimport/test-qcow2.c diff --git a/src/grp-machine/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile index d0e8781faf..f8fcbc3cca 100644 --- a/src/grp-machine/grp-import/systemd-export/Makefile +++ b/src/grp-machine/grp-import/systemd-export/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-export @@ -30,11 +30,7 @@ systemd_export_SOURCES = \ src/import/export-tar.c \ src/import/export-tar.h \ src/import/export-raw.c \ - src/import/export-raw.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h + src/import/export-raw.h systemd_export_CFLAGS = \ $(AM_CFLAGS) \ @@ -44,6 +40,7 @@ systemd_export_CFLAGS = \ systemd_export_LDADD = \ libshared.la \ + libimport.la \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ $(BZIP2_LIBS) diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile index 301556ffd5..06fd01fcd7 100644 --- a/src/grp-machine/grp-import/systemd-import/Makefile +++ b/src/grp-machine/grp-import/systemd-import/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-import @@ -29,13 +29,7 @@ systemd_import_SOURCES = \ src/import/import-raw.c \ src/import/import-raw.h \ src/import/import-tar.c \ - src/import/import-tar.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h + src/import/import-tar.h systemd_import_CFLAGS = \ $(AM_CFLAGS) \ @@ -45,6 +39,7 @@ systemd_import_CFLAGS = \ systemd_import_LDADD = \ libshared.la \ + libimport.la \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ $(BZIP2_LIBS) diff --git a/src/grp-machine/grp-import/.gitignore b/src/grp-machine/grp-import/systemd-importd/.gitignore index 01106e2e68..01106e2e68 100644 --- a/src/grp-machine/grp-import/.gitignore +++ b/src/grp-machine/grp-import/systemd-importd/.gitignore diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile index 7911bfce82..1f5bae1267 100644 --- a/src/grp-machine/grp-import/systemd-importd/Makefile +++ b/src/grp-machine/grp-import/systemd-importd/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-importd @@ -36,4 +36,34 @@ systemd_importd_CFLAGS = \ systemd_importd_LDADD = \ libshared.la +dist_rootlibexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in + +EXTRA_DIST += \ + units/systemd-importd.service.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/grp-import/org.freedesktop.import1.conf b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.conf index ed2539a03b..ed2539a03b 100644 --- a/src/grp-machine/grp-import/org.freedesktop.import1.conf +++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.conf diff --git a/src/grp-machine/grp-import/org.freedesktop.import1.policy.in b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.policy.in index 85924ed743..85924ed743 100644 --- a/src/grp-machine/grp-import/org.freedesktop.import1.policy.in +++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.policy.in diff --git a/src/grp-machine/grp-import/org.freedesktop.import1.service b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.service index 8fc4c47881..8fc4c47881 100644 --- a/src/grp-machine/grp-import/org.freedesktop.import1.service +++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.service diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile index 36505edb5b..1ee9fa25de 100644 --- a/src/grp-machine/grp-import/systemd-pull/Makefile +++ b/src/grp-machine/grp-import/systemd-pull/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-pull @@ -34,14 +34,8 @@ systemd_pull_SOURCES = \ src/import/pull-job.h \ src/import/pull-common.c \ src/import/pull-common.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h \ src/import/curl-util.c \ - src/import/curl-util.h \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h + src/import/curl-util.h systemd_pull_CFLAGS = \ $(AM_CFLAGS) \ @@ -54,6 +48,7 @@ systemd_pull_CFLAGS = \ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" systemd_pull_LDADD = \ + libimport.la \ libshared.la \ $(LIBCURL_LIBS) \ $(XZ_LIBS) \ diff --git a/src/grp-machine/grp-import/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c index 9e0d56e5c3..9e0d56e5c3 100644 --- a/src/grp-machine/grp-import/curl-util.c +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c diff --git a/src/grp-machine/grp-import/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h index 296b35d09c..296b35d09c 100644 --- a/src/grp-machine/grp-import/curl-util.h +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h diff --git a/src/grp-machine/libmachine-core/.gitignore b/src/grp-machine/systemd-machined/.gitignore index e1065b5894..e1065b5894 100644 --- a/src/grp-machine/libmachine-core/.gitignore +++ b/src/grp-machine/systemd-machined/.gitignore diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 8aac7b0f4f..182b52edd2 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -23,12 +23,26 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +_libmachine_core_la_SOURCES = \ + src/machine/machine.c \ + src/machine/machine.h \ + src/machine/machined-dbus.c \ + src/machine/machine-dbus.c \ + src/machine/machine-dbus.h \ + src/machine/image-dbus.c \ + src/machine/image-dbus.h \ + src/machine/operation.c \ + src/machine/operation.h + systemd_machined_SOURCES = \ + $(_libmachine_core_la_SOURCES) \ src/machine/machined.c \ src/machine/machined.h systemd_machined_LDADD = \ - libmachine-core.la + libsystemd-internal.la \ + libshared.la \ + libbasic.la rootlibexec_PROGRAMS += \ systemd-machined @@ -64,4 +78,11 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-machined.service.in +test_machine_tables_SOURCES = \ + $(_libmachine_core_la_SOURCES) \ + src/machine/test-machine-tables.c + +tests += \ + test-machine-tables + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c index 584777e5ad..584777e5ad 100644 --- a/src/grp-machine/libmachine-core/image-dbus.c +++ b/src/grp-machine/systemd-machined/image-dbus.c diff --git a/src/grp-machine/libmachine-core/image-dbus.h b/src/grp-machine/systemd-machined/image-dbus.h index b62da996c6..b62da996c6 100644 --- a/src/grp-machine/libmachine-core/image-dbus.h +++ b/src/grp-machine/systemd-machined/image-dbus.h diff --git a/src/grp-machine/libmachine-core/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c index 4e1b92f486..95f2084455 100644 --- a/src/grp-machine/libmachine-core/machine-dbus.c +++ b/src/grp-machine/systemd-machined/machine-dbus.c @@ -29,10 +29,7 @@ #undef basename #include "basic/alloc-util.h" -#include "bus-common-errors.h" -#include "bus-internal.h" #include "basic/bus-label.h" -#include "shared/bus-util.h" #include "basic/copy.h" #include "basic/env-util.h" #include "basic/fd-util.h" @@ -40,9 +37,6 @@ #include "basic/formats-util.h" #include "basic/fs-util.h" #include "basic/in-addr-util.h" -#include "local-addresses.h" -#include "machine-dbus.h" -#include "machine.h" #include "basic/mkdir.h" #include "basic/path-util.h" #include "basic/process-util.h" @@ -50,6 +44,13 @@ #include "basic/strv.h" #include "basic/terminal-util.h" #include "basic/user-util.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-internal.h" +#include "sd-netlink/local-addresses.h" +#include "shared/bus-util.h" + +#include "machine-dbus.h" +#include "machine.h" static int property_get_id( sd_bus *bus, diff --git a/src/grp-machine/libmachine-core/machine-dbus.h b/src/grp-machine/systemd-machined/machine-dbus.h index d3faf5cb07..d3faf5cb07 100644 --- a/src/grp-machine/libmachine-core/machine-dbus.h +++ b/src/grp-machine/systemd-machined/machine-dbus.h diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/systemd-machined/machine.c index 82d8f66395..82d8f66395 100644 --- a/src/grp-machine/libmachine-core/machine.c +++ b/src/grp-machine/systemd-machined/machine.c diff --git a/src/grp-machine/libmachine-core/machine.h b/src/grp-machine/systemd-machined/machine.h index cba0311c23..cba0311c23 100644 --- a/src/grp-machine/libmachine-core/machine.h +++ b/src/grp-machine/systemd-machined/machine.h diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c index 7caecd43a0..7caecd43a0 100644 --- a/src/grp-machine/libmachine-core/machined-dbus.c +++ b/src/grp-machine/systemd-machined/machined-dbus.c diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c index 54fc3d812b..83a74e2549 100644 --- a/src/grp-machine/systemd-machined/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -31,11 +31,12 @@ #include "basic/hostname-util.h" #include "basic/label.h" #include "basic/signal-util.h" -#include "machined.h" #include "sd-bus/bus-error.h" #include "shared/bus-util.h" #include "shared/machine-image.h" +#include "machined.h" + Manager *manager_new(void) { Manager *m; int r; diff --git a/src/grp-machine/libmachine-core/machined.h b/src/grp-machine/systemd-machined/machined.h index b16ea3ef15..b16ea3ef15 100644 --- a/src/grp-machine/libmachine-core/machined.h +++ b/src/grp-machine/systemd-machined/machined.h diff --git a/src/grp-machine/libmachine-core/operation.c b/src/grp-machine/systemd-machined/operation.c index f1bcb1d860..f1bcb1d860 100644 --- a/src/grp-machine/libmachine-core/operation.c +++ b/src/grp-machine/systemd-machined/operation.c diff --git a/src/grp-machine/libmachine-core/operation.h b/src/grp-machine/systemd-machined/operation.h index 0821466a00..0821466a00 100644 --- a/src/grp-machine/libmachine-core/operation.h +++ b/src/grp-machine/systemd-machined/operation.h diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf index 9d40b90151..9d40b90151 100644 --- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in index 69f78a5c25..69f78a5c25 100644 --- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.service b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service index d3dc99852b..d3dc99852b 100644 --- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.service +++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service diff --git a/src/grp-machine/libmachine-core/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c index 7d44c55a4b..7d44c55a4b 100644 --- a/src/grp-machine/libmachine-core/test-machine-tables.c +++ b/src/grp-machine/systemd-machined/test-machine-tables.c |