diff options
Diffstat (limited to 'src/grp-machine/grp-import')
24 files changed, 73 insertions, 57 deletions
diff --git a/src/grp-machine/grp-import/curl-util.c b/src/grp-machine/grp-import/curl-util.c index d6570a3656..9e0d56e5c3 100644 --- a/src/grp-machine/grp-import/curl-util.c +++ b/src/grp-machine/grp-import/curl-util.c @@ -18,10 +18,11 @@ ***/ #include "basic/alloc-util.h" -#include "curl-util.h" #include "basic/fd-util.h" #include "basic/string-util.h" +#include "curl-util.h" + static void curl_glue_check_finished(CurlGlue *g) { CURLMsg *msg; int k = 0; diff --git a/src/grp-machine/grp-import/qcow2-util.c b/src/grp-machine/grp-import/qcow2-util.c index fa272088d3..bc50b7d0b3 100644 --- a/src/grp-machine/grp-import/qcow2-util.c +++ b/src/grp-machine/grp-import/qcow2-util.c @@ -21,10 +21,11 @@ #include "basic/alloc-util.h" #include "basic/btrfs-util.h" -#include "qcow2-util.h" #include "basic/sparse-endian.h" #include "basic/util.h" +#include "qcow2-util.h" + #define QCOW2_MAGIC 0x514649fb #define QCOW2_COPIED (1ULL << 63) diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h index 13d7809b9d..00f6931d7b 100644 --- a/src/grp-machine/grp-import/systemd-export/export-raw.h +++ b/src/grp-machine/grp-import/systemd-export/export-raw.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "import-compress.h" #include "basic/macro.h" +#include "import-compress.h" typedef struct RawExport RawExport; diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c index 9a8d48dc2e..e2b3c5f2e9 100644 --- a/src/grp-machine/grp-import/systemd-export/export-tar.c +++ b/src/grp-machine/grp-import/systemd-export/export-tar.c @@ -21,14 +21,15 @@ #include "basic/alloc-util.h" #include "basic/btrfs-util.h" -#include "export-tar.h" #include "basic/fd-util.h" #include "basic/fileio.h" -#include "import-common.h" #include "basic/process-util.h" #include "basic/ratelimit.h" #include "basic/string-util.h" #include "basic/util.h" +#include "import-common.h" + +#include "export-tar.h" #define COPY_BUFFER_SIZE (16*1024) diff --git a/src/grp-machine/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h index 0a59033d5b..9efde8931d 100644 --- a/src/grp-machine/grp-import/systemd-export/export-tar.h +++ b/src/grp-machine/grp-import/systemd-export/export-tar.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "import-compress.h" #include "basic/macro.h" +#include "import-compress.h" typedef struct TarExport TarExport; diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c index a64b79bba0..5db164c7d1 100644 --- a/src/grp-machine/grp-import/systemd-export/export.c +++ b/src/grp-machine/grp-import/systemd-export/export.c @@ -22,16 +22,17 @@ #include <systemd/sd-event.h> #include "basic/alloc-util.h" -#include "export-raw.h" -#include "export-tar.h" #include "basic/fd-util.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "shared/import-util.h" -#include "shared/machine-image.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 "export-raw.h" +#include "export-tar.h" static ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN; diff --git a/src/grp-machine/grp-import/systemd-import/import-common.c b/src/grp-machine/grp-import/systemd-import/import-common.c index c2baef83f8..cd69e900ec 100644 --- a/src/grp-machine/grp-import/systemd-import/import-common.c +++ b/src/grp-machine/grp-import/systemd-import/import-common.c @@ -25,10 +25,11 @@ #include "basic/btrfs-util.h" #include "basic/capability-util.h" #include "basic/fd-util.h" -#include "import-common.h" #include "basic/signal-util.h" #include "basic/util.h" +#include "import-common.h" + int import_make_read_only_fd(int fd) { int r; diff --git a/src/grp-machine/grp-import/systemd-import/import-compress.c b/src/grp-machine/grp-import/systemd-import/import-compress.c index 05643cfbaf..4f1a9891e8 100644 --- a/src/grp-machine/grp-import/systemd-import/import-compress.c +++ b/src/grp-machine/grp-import/systemd-import/import-compress.c @@ -17,10 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "import-compress.h" #include "basic/string-table.h" #include "basic/util.h" +#include "import-compress.h" + void import_compress_free(ImportCompress *c) { assert(c); 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 0bbae2aa8a..658c912f88 100644 --- a/src/grp-machine/grp-import/systemd-import/import-raw.c +++ b/src/grp-machine/grp-import/systemd-import/import-raw.c @@ -30,18 +30,19 @@ #include "basic/fileio.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "import-common.h" -#include "import-compress.h" -#include "import-raw.h" #include "basic/io-util.h" -#include "shared/machine-pool.h" #include "basic/mkdir.h" #include "basic/path-util.h" -#include "qcow2-util.h" #include "basic/ratelimit.h" #include "basic/rm-rf.h" #include "basic/string-util.h" #include "basic/util.h" +#include "qcow2-util.h" +#include "shared/machine-pool.h" + +#include "import-common.h" +#include "import-compress.h" +#include "import-raw.h" struct RawImport { sd_event *event; 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 a3bc532d37..61ec8cc91e 100644 --- a/src/grp-machine/grp-import/systemd-import/import-raw.h +++ b/src/grp-machine/grp-import/systemd-import/import-raw.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "shared/import-util.h" #include "basic/macro.h" +#include "shared/import-util.h" typedef struct RawImport RawImport; 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 8848beb11b..f66a7e7e4c 100644 --- a/src/grp-machine/grp-import/systemd-import/import-tar.c +++ b/src/grp-machine/grp-import/systemd-import/import-tar.c @@ -29,19 +29,20 @@ #include "basic/fileio.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "import-common.h" -#include "import-compress.h" -#include "import-tar.h" #include "basic/io-util.h" -#include "shared/machine-pool.h" #include "basic/mkdir.h" #include "basic/path-util.h" #include "basic/process-util.h" -#include "qcow2-util.h" #include "basic/ratelimit.h" #include "basic/rm-rf.h" #include "basic/string-util.h" #include "basic/util.h" +#include "qcow2-util.h" +#include "shared/machine-pool.h" + +#include "import-common.h" +#include "import-compress.h" +#include "import-tar.h" struct TarImport { sd_event *event; 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 90ab082f1a..35a08fcfc5 100644 --- a/src/grp-machine/grp-import/systemd-import/import-tar.h +++ b/src/grp-machine/grp-import/systemd-import/import-tar.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "shared/import-util.h" #include "basic/macro.h" +#include "shared/import-util.h" typedef struct TarImport TarImport; diff --git a/src/grp-machine/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c index 6c76c639c3..6744006312 100644 --- a/src/grp-machine/grp-import/systemd-import/import.c +++ b/src/grp-machine/grp-import/systemd-import/import.c @@ -25,13 +25,14 @@ #include "basic/fd-util.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "import-raw.h" -#include "import-tar.h" -#include "shared/import-util.h" -#include "shared/machine-image.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 "import-raw.h" +#include "import-tar.h" static bool arg_force = false; static bool arg_read_only = false; diff --git a/src/grp-machine/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c index f9fe1038cd..e790c0c475 100644 --- a/src/grp-machine/grp-import/systemd-importd/importd.c +++ b/src/grp-machine/grp-import/systemd-importd/importd.c @@ -22,13 +22,9 @@ #include <systemd/sd-bus.h> #include "basic/alloc-util.h" -#include "bus-common-errors.h" -#include "shared/bus-util.h" #include "basic/def.h" #include "basic/fd-util.h" #include "basic/hostname-util.h" -#include "shared/import-util.h" -#include "shared/machine-pool.h" #include "basic/missing.h" #include "basic/mkdir.h" #include "basic/parse-util.h" @@ -42,6 +38,10 @@ #include "basic/user-util.h" #include "basic/util.h" #include "basic/web-util.h" +#include "sd-bus/bus-common-errors.h" +#include "shared/bus-util.h" +#include "shared/import-util.h" +#include "shared/machine-pool.h" typedef struct Transfer Transfer; typedef struct Manager Manager; diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c index fb167fd93c..f5815c216d 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c @@ -29,8 +29,6 @@ #include "basic/io-util.h" #include "basic/path-util.h" #include "basic/process-util.h" -#include "pull-common.h" -#include "pull-job.h" #include "basic/rm-rf.h" #include "basic/signal-util.h" #include "basic/siphash24.h" @@ -39,6 +37,9 @@ #include "basic/util.h" #include "basic/web-util.h" +#include "pull-common.h" +#include "pull-job.h" + #define FILENAME_ESCAPE "/.#\"\'" #define HASH_URL_THRESHOLD_LENGTH (_POSIX_PATH_MAX - 16) diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.h b/src/grp-machine/grp-import/systemd-pull/pull-common.h index d9cfb6b3c1..96198a695a 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h @@ -22,6 +22,7 @@ #include <stdbool.h> #include "shared/import-util.h" + #include "pull-job.h" int pull_make_local_copy(const char *final, const char *root, const char *local, bool force_local); diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.c b/src/grp-machine/grp-import/systemd-pull/pull-job.c index fce08f65d9..3735304e6d 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c @@ -23,12 +23,13 @@ #include "basic/fd-util.h" #include "basic/hexdecoct.h" #include "basic/io-util.h" -#include "shared/machine-pool.h" #include "basic/parse-util.h" -#include "pull-job.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/xattr-util.h" +#include "shared/machine-pool.h" + +#include "pull-job.h" PullJob* pull_job_unref(PullJob *j) { if (!j) diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h index 80d7370ff1..d8308e4046 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h @@ -21,9 +21,9 @@ #include <gcrypt.h> +#include "basic/macro.h" #include "curl-util.h" #include "import-compress.h" -#include "basic/macro.h" typedef struct PullJob PullJob; diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c index a9777a5838..acf26567d3 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c @@ -27,26 +27,27 @@ #include "basic/btrfs-util.h" #include "basic/chattr-util.h" #include "basic/copy.h" -#include "curl-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "import-common.h" -#include "shared/import-util.h" #include "basic/macro.h" #include "basic/mkdir.h" #include "basic/path-util.h" -#include "pull-common.h" -#include "pull-job.h" -#include "pull-raw.h" -#include "qcow2-util.h" #include "basic/rm-rf.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/utf8.h" #include "basic/util.h" #include "basic/web-util.h" +#include "curl-util.h" +#include "import-common.h" +#include "qcow2-util.h" +#include "shared/import-util.h" + +#include "pull-common.h" +#include "pull-job.h" +#include "pull-raw.h" typedef enum RawProgress { RAW_DOWNLOADING, diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.h b/src/grp-machine/grp-import/systemd-pull/pull-raw.h index 84cd146647..47ed499c12 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "shared/import-util.h" #include "basic/macro.h" +#include "shared/import-util.h" typedef struct RawPull RawPull; diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c index 576bda5a3d..e6031db0ed 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c @@ -25,26 +25,27 @@ #include "basic/alloc-util.h" #include "basic/btrfs-util.h" #include "basic/copy.h" -#include "curl-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/fs-util.h" #include "basic/hostname-util.h" -#include "import-common.h" -#include "shared/import-util.h" #include "basic/macro.h" #include "basic/mkdir.h" #include "basic/path-util.h" #include "basic/process-util.h" -#include "pull-common.h" -#include "pull-job.h" -#include "pull-tar.h" #include "basic/rm-rf.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/utf8.h" #include "basic/util.h" #include "basic/web-util.h" +#include "curl-util.h" +#include "import-common.h" +#include "shared/import-util.h" + +#include "pull-common.h" +#include "pull-job.h" +#include "pull-tar.h" typedef enum TarProgress { TAR_DOWNLOADING, diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.h b/src/grp-machine/grp-import/systemd-pull/pull-tar.h index addd1f861c..a2850fee9e 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.h @@ -21,8 +21,8 @@ #include <systemd/sd-event.h> -#include "shared/import-util.h" #include "basic/macro.h" +#include "shared/import-util.h" typedef struct TarPull TarPull; diff --git a/src/grp-machine/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c index fa2af2fc02..166f91d6e1 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull.c +++ b/src/grp-machine/grp-import/systemd-pull/pull.c @@ -23,15 +23,16 @@ #include "basic/alloc-util.h" #include "basic/hostname-util.h" -#include "shared/import-util.h" -#include "shared/machine-image.h" #include "basic/parse-util.h" -#include "pull-raw.h" -#include "pull-tar.h" #include "basic/signal-util.h" #include "basic/string-util.h" #include "basic/verbs.h" #include "basic/web-util.h" +#include "shared/import-util.h" +#include "shared/machine-image.h" + +#include "pull-raw.h" +#include "pull-tar.h" static bool arg_force = false; static const char *arg_image_root = "/var/lib/machines"; diff --git a/src/grp-machine/grp-import/test-qcow2.c b/src/grp-machine/grp-import/test-qcow2.c index 0a256d7f41..15d7c29aef 100644 --- a/src/grp-machine/grp-import/test-qcow2.c +++ b/src/grp-machine/grp-import/test-qcow2.c @@ -19,9 +19,10 @@ #include "basic/fd-util.h" #include "basic/log.h" -#include "qcow2-util.h" #include "basic/util.h" +#include "qcow2-util.h" + int main(int argc, char *argv[]) { _cleanup_close_ int sfd = -1, dfd = -1; int r; |