diff options
Diffstat (limited to 'src/grp-machine')
40 files changed, 302 insertions, 302 deletions
diff --git a/src/grp-machine/grp-import/libimport/import-common.c b/src/grp-machine/grp-import/libimport/import-common.c index 9061cd4da1..b0a34d5745 100644 --- a/src/grp-machine/grp-import/libimport/import-common.c +++ b/src/grp-machine/grp-import/libimport/import-common.c @@ -22,11 +22,11 @@ #include <sys/stat.h> #include <unistd.h> -#include "basic/btrfs-util.h" -#include "basic/capability-util.h" -#include "basic/fd-util.h" -#include "basic/signal-util.h" -#include "basic/util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/util.h" #include "import-common.h" diff --git a/src/grp-machine/grp-import/libimport/import-compress.c b/src/grp-machine/grp-import/libimport/import-compress.c index 4f1a9891e8..2e116df26c 100644 --- a/src/grp-machine/grp-import/libimport/import-compress.c +++ b/src/grp-machine/grp-import/libimport/import-compress.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/string-table.h" -#include "basic/util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/util.h" #include "import-compress.h" diff --git a/src/grp-machine/grp-import/libimport/import-compress.h b/src/grp-machine/grp-import/libimport/import-compress.h index 130afb4cd0..025dd030be 100644 --- a/src/grp-machine/grp-import/libimport/import-compress.h +++ b/src/grp-machine/grp-import/libimport/import-compress.h @@ -24,7 +24,7 @@ #include <sys/types.h> #include <zlib.h> -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef enum ImportCompressType { IMPORT_COMPRESS_UNKNOWN, diff --git a/src/grp-machine/grp-import/libimport/qcow2-util.c b/src/grp-machine/grp-import/libimport/qcow2-util.c index bc50b7d0b3..4c81fbebc7 100644 --- a/src/grp-machine/grp-import/libimport/qcow2-util.c +++ b/src/grp-machine/grp-import/libimport/qcow2-util.c @@ -19,10 +19,10 @@ #include <zlib.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/sparse-endian.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/sparse-endian.h" +#include "systemd-basic/util.h" #include "qcow2-util.h" diff --git a/src/grp-machine/grp-import/libimport/test-qcow2.c b/src/grp-machine/grp-import/libimport/test-qcow2.c index 15d7c29aef..7c973970ba 100644 --- a/src/grp-machine/grp-import/libimport/test-qcow2.c +++ b/src/grp-machine/grp-import/libimport/test-qcow2.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" #include "qcow2-util.h" diff --git a/src/grp-machine/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c index c17fc952d3..bce4cdf3d4 100644 --- a/src/grp-machine/grp-import/systemd-export/export-raw.c +++ b/src/grp-machine/grp-import/systemd-export/export-raw.c @@ -27,15 +27,15 @@ #include <systemd/sd-daemon.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/ratelimit.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "import-common.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/ratelimit.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "export-raw.h" 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 cf34d512bc..89aef76eed 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 "basic/macro.h" #include "import-compress.h" +#include "systemd-basic/macro.h" typedef struct RawExport RawExport; typedef void (*RawExportFinished)(RawExport *export, int error, void *userdata); 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 e2b3c5f2e9..701dfaf61d 100644 --- a/src/grp-machine/grp-import/systemd-export/export-tar.c +++ b/src/grp-machine/grp-import/systemd-export/export-tar.c @@ -19,15 +19,15 @@ #include <systemd/sd-daemon.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/process-util.h" -#include "basic/ratelimit.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "import-common.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "export-tar.h" 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 c048a6d642..2c50c1e5bf 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 "basic/macro.h" #include "import-compress.h" +#include "systemd-basic/macro.h" typedef struct TarExport TarExport; typedef void (*TarExportFinished)(TarExport *export, int error, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c index 5db164c7d1..a07273da7c 100644 --- a/src/grp-machine/grp-import/systemd-export/export.c +++ b/src/grp-machine/grp-import/systemd-export/export.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 "export-raw.h" #include "export-tar.h" 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 ae7e0b017d..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,8 +21,8 @@ #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); 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 b5012f1ea4..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,8 +21,8 @@ #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); 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" diff --git a/src/grp-machine/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c index f032f06fcf..604b94e616 100644 --- a/src/grp-machine/grp-import/systemd-importd/importd.c +++ b/src/grp-machine/grp-import/systemd-importd/importd.c @@ -21,27 +21,27 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/hostname-util.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/socket-util.h" -#include "basic/string-table.h" -#include "basic/strv.h" -#include "basic/syslog-util.h" -#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" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/syslog-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/import-util.h" +#include "systemd-shared/machine-pool.h" typedef struct Transfer Transfer; typedef struct Manager Manager; diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c index 9e0d56e5c3..52d0894018 100644 --- a/src/grp-machine/grp-import/systemd-pull/curl-util.c +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/string-util.h" #include "curl-util.h" diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h index 296b35d09c..1619aeb18c 100644 --- a/src/grp-machine/grp-import/systemd-pull/curl-util.h +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h @@ -24,7 +24,7 @@ #include <systemd/sd-event.h> -#include "basic/hashmap.h" +#include "systemd-basic/hashmap.h" typedef struct CurlGlue CurlGlue; 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 bd1623e003..9830d8a10f 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c @@ -19,23 +19,23 @@ #include <sys/prctl.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/capability-util.h" -#include "basic/copy.h" -#include "basic/dirent-util.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/rm-rf.h" -#include "basic/signal-util.h" -#include "basic/siphash24.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "basic/web-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" #include "pull-common.h" #include "pull-job.h" 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 96198a695a..1eb8f27fe8 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "shared/import-util.h" +#include "systemd-shared/import-util.h" #include "pull-job.h" 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 3735304e6d..e51ac6546e 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c @@ -19,15 +19,15 @@ #include <sys/xattr.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/hexdecoct.h" -#include "basic/io-util.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/xattr-util.h" -#include "shared/machine-pool.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/xattr-util.h" +#include "systemd-shared/machine-pool.h" #include "pull-job.h" 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 296e32bd09..8a99883794 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h @@ -21,8 +21,8 @@ #include <gcrypt.h> -#include "basic/macro.h" #include "import-compress.h" +#include "systemd-basic/macro.h" #include "curl-util.h" 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 9602915a1f..0ed1a83fe4 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c @@ -24,26 +24,26 @@ #include <systemd/sd-daemon.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/macro.h" -#include "basic/mkdir.h" -#include "basic/path-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 "import-common.h" #include "qcow2-util.h" -#include "shared/import-util.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/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" #include "curl-util.h" #include "pull-common.h" 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 93032edf09..0940cff93b 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 "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct RawPull RawPull; typedef void (*RawPullFinished)(RawPull *pull, int error, void *userdata); 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 121ca31dbd..fbc7accaed 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c @@ -22,25 +22,25 @@ #include <systemd/sd-daemon.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/macro.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/process-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 "import-common.h" -#include "shared/import-util.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/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" #include "curl-util.h" #include "pull-common.h" 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 81797fa359..21d4db5519 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 "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct TarPull TarPull; typedef void (*TarPullFinished)(TarPull *pull, int error, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c index 4153c938d8..a6b5ed47a8 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull.c +++ b/src/grp-machine/grp-import/systemd-pull/pull.c @@ -21,15 +21,15 @@ #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/hostname-util.h" -#include "basic/parse-util.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 "systemd-basic/alloc-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/verbs.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" +#include "systemd-shared/machine-image.h" #include "pull-raw.h" #include "pull-tar.h" diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c index d5304dba37..fd78ac52cb 100644 --- a/src/grp-machine/machinectl/machinectl.c +++ b/src/grp-machine/machinectl/machinectl.c @@ -31,35 +31,35 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.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 "basic/log.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "basic/verbs.h" -#include "basic/web-util.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/cgroup-show.h" -#include "shared/import-util.h" -#include "shared/logs-show.h" -#include "shared/pager.h" -#include "shared/ptyfwd.h" -#include "shared/spawn-polkit-agent.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-basic/verbs.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/cgroup-show.h" +#include "systemd-shared/import-util.h" +#include "systemd-shared/logs-show.h" +#include "systemd-shared/pager.h" +#include "systemd-shared/ptyfwd.h" +#include "systemd-shared/spawn-polkit-agent.h" static char **arg_property = NULL; static bool arg_all = false; diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 54d78ed2f1..5e3d878b23 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -37,7 +37,7 @@ libnss_mymachines_la_LDFLAGS = \ libnss_mymachines_la_LIBADD = \ libsystemd-internal.la \ - libbasic.la + libsystemd-basic.la lib_LTLIBRARIES += \ libnss_mymachines.la diff --git a/src/grp-machine/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c index 0bcdd45d37..4299dd7a0b 100644 --- a/src/grp-machine/nss-mymachines/nss-mymachines.c +++ b/src/grp-machine/nss-mymachines/nss-mymachines.c @@ -23,16 +23,16 @@ #include <systemd/sd-bus.h> #include <systemd/sd-login.h> -#include "basic/alloc-util.h" -#include "basic/hostname-util.h" -#include "basic/in-addr-util.h" -#include "basic/macro.h" -#include "basic/nss-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" -#include "basic/user-util.h" -#include "basic/util.h" #include "sd-bus/bus-common-errors.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/nss-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); diff --git a/src/grp-machine/systemd-machined/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c index 6ab627a710..e34b2578f6 100644 --- a/src/grp-machine/systemd-machined/image-dbus.c +++ b/src/grp-machine/systemd-machined/image-dbus.c @@ -17,15 +17,15 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/bus-label.h" -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/process-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" -#include "shared/bus-util.h" -#include "shared/machine-image.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/bus-label.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/machine-image.h" #include "image-dbus.h" diff --git a/src/grp-machine/systemd-machined/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c index 91b5dfa993..769101ab42 100644 --- a/src/grp-machine/systemd-machined/machine-dbus.c +++ b/src/grp-machine/systemd-machined/machine-dbus.c @@ -28,26 +28,26 @@ #include <libgen.h> #undef basename -#include "basic/alloc-util.h" -#include "basic/bus-label.h" -#include "basic/copy.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/in-addr-util.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#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 "systemd-basic/alloc-util.h" +#include "systemd-basic/bus-label.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/bus-util.h" #include "machine-dbus.h" #include "machine.h" diff --git a/src/grp-machine/systemd-machined/machine.c b/src/grp-machine/systemd-machined/machine.c index 701fec0e67..75d1c98023 100644 --- a/src/grp-machine/systemd-machined/machine.c +++ b/src/grp-machine/systemd-machined/machine.c @@ -23,23 +23,23 @@ #include <systemd/sd-messages.h> -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/extract-word.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/hashmap.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/special.h" -#include "basic/string-table.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/extract-word.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/bus-util.h" #include "machine-dbus.h" #include "machine.h" diff --git a/src/grp-machine/systemd-machined/machine.h b/src/grp-machine/systemd-machined/machine.h index e93f0cf222..361451b1c8 100644 --- a/src/grp-machine/systemd-machined/machine.h +++ b/src/grp-machine/systemd-machined/machine.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/list.h" +#include "systemd-basic/list.h" typedef enum KillWho KillWho; typedef struct Machine Machine; diff --git a/src/grp-machine/systemd-machined/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c index 349ffcf298..0a836fb5fd 100644 --- a/src/grp-machine/systemd-machined/machined-dbus.c +++ b/src/grp-machine/systemd-machined/machined-dbus.c @@ -23,24 +23,24 @@ #include <systemd/sd-id128.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/cgroup-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/hostname-util.h" -#include "basic/io-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/stdio-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/user-util.h" #include "sd-bus/bus-common-errors.h" -#include "shared/bus-util.h" -#include "shared/machine-image.h" -#include "shared/machine-pool.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/machine-image.h" +#include "systemd-shared/machine-pool.h" #include "image-dbus.h" #include "machine-dbus.h" diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c index a01d1820a1..f947bbd144 100644 --- a/src/grp-machine/systemd-machined/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -23,17 +23,17 @@ #include <systemd/sd-daemon.h> -#include "basic/alloc-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 "basic/signal-util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "shared/machine-image.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/label.h" +#include "systemd-basic/signal-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/machine-image.h" #include "machined.h" diff --git a/src/grp-machine/systemd-machined/machined.h b/src/grp-machine/systemd-machined/machined.h index b16ea3ef15..8994097db0 100644 --- a/src/grp-machine/systemd-machined/machined.h +++ b/src/grp-machine/systemd-machined/machined.h @@ -24,8 +24,8 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/hashmap.h" -#include "basic/list.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/list.h" typedef struct Manager Manager; diff --git a/src/grp-machine/systemd-machined/operation.c b/src/grp-machine/systemd-machined/operation.c index f16c38c47a..9732be95fb 100644 --- a/src/grp-machine/systemd-machined/operation.c +++ b/src/grp-machine/systemd-machined/operation.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/process-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/process-util.h" #include "operation.h" diff --git a/src/grp-machine/systemd-machined/operation.h b/src/grp-machine/systemd-machined/operation.h index 713ffe88c4..5eed62bd6f 100644 --- a/src/grp-machine/systemd-machined/operation.h +++ b/src/grp-machine/systemd-machined/operation.h @@ -24,7 +24,7 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/list.h" +#include "systemd-basic/list.h" typedef struct Operation Operation; diff --git a/src/grp-machine/systemd-machined/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c index 7d44c55a4b..8f9ce8d385 100644 --- a/src/grp-machine/systemd-machined/test-machine-tables.c +++ b/src/grp-machine/systemd-machined/test-machine-tables.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "shared/test-tables.h" +#include "systemd-shared/test-tables.h" #include "machine.h" |