diff options
Diffstat (limited to 'src/grp-machine/grp-import/systemd-import')
6 files changed, 46 insertions, 47 deletions
diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile index fe3105914c..51510f4470 100644 --- a/src/grp-machine/grp-import/systemd-import/Makefile +++ b/src/grp-machine/grp-import/systemd-import/Makefile @@ -38,6 +38,7 @@ systemd_import_CFLAGS = \ systemd_import_LDADD = \ libsystemd-shared.la \ + libimport.la \ $(XZ_LIBS) \ $(ZLIB_LIBS) \ $(BZIP2_LIBS) diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c index 55a6d044ab..7b7226b843 100644 --- a/src/grp-machine/grp-import/systemd-import/import-raw.c +++ b/src/grp-machine/grp-import/systemd-import/import-raw.c @@ -22,25 +22,25 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/chattr-util.h" -#include "basic/copy.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/hostname-util.h" -#include "basic/io-util.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/ratelimit.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "import-common.h" #include "import-compress.h" #include "qcow2-util.h" -#include "shared/machine-pool.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/chattr-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/machine-pool.h" #include "import-raw.h" diff --git a/src/grp-machine/grp-import/systemd-import/import-raw.h b/src/grp-machine/grp-import/systemd-import/import-raw.h index 61ec8cc91e..64c532242d 100644 --- a/src/grp-machine/grp-import/systemd-import/import-raw.h +++ b/src/grp-machine/grp-import/systemd-import/import-raw.h @@ -21,11 +21,10 @@ #include <systemd/sd-event.h> -#include "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct RawImport RawImport; - typedef void (*RawImportFinished)(RawImport *import, int error, void *userdata); int raw_import_new(RawImport **import, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c index 0d61b5f01d..592377a72a 100644 --- a/src/grp-machine/grp-import/systemd-import/import-tar.c +++ b/src/grp-machine/grp-import/systemd-import/import-tar.c @@ -22,25 +22,25 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/copy.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/hostname-util.h" -#include "basic/io-util.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/ratelimit.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "import-common.h" #include "import-compress.h" #include "qcow2-util.h" -#include "shared/machine-pool.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/machine-pool.h" #include "import-tar.h" diff --git a/src/grp-machine/grp-import/systemd-import/import-tar.h b/src/grp-machine/grp-import/systemd-import/import-tar.h index 35a08fcfc5..01c3f2d542 100644 --- a/src/grp-machine/grp-import/systemd-import/import-tar.h +++ b/src/grp-machine/grp-import/systemd-import/import-tar.h @@ -21,11 +21,10 @@ #include <systemd/sd-event.h> -#include "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct TarImport TarImport; - typedef void (*TarImportFinished)(TarImport *import, int error, void *userdata); int tar_import_new(TarImport **import, sd_event *event, const char *image_root, TarImportFinished on_finished, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c index 38fe7f8110..d6f772a159 100644 --- a/src/grp-machine/grp-import/systemd-import/import.c +++ b/src/grp-machine/grp-import/systemd-import/import.c @@ -21,15 +21,15 @@ #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/hostname-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" -#include "basic/verbs.h" -#include "shared/import-util.h" -#include "shared/machine-image.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/verbs.h" +#include "systemd-shared/import-util.h" +#include "systemd-shared/machine-image.h" #include "import-raw.h" #include "import-tar.h" |