diff options
Diffstat (limited to 'src/grp-system/grp-utils')
7 files changed, 94 insertions, 95 deletions
diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c index e27ae4f5c5..d98970b31c 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c @@ -19,15 +19,15 @@ #include <stdlib.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/path-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "manager.h" +#include "core/manager.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "shared/pager.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h index 7b89007fd0..33b809997a 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h +++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h @@ -21,6 +21,6 @@ #include <stdbool.h> -#include "shared/path-lookup.h" +#include "systemd-shared/path-lookup.h" int verify_units(char **filenames, UnitFileScope scope, bool check_man); diff --git a/src/grp-system/grp-utils/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c index e79a109651..7d7dd52648 100644 --- a/src/grp-system/grp-utils/systemd-analyze/analyze.c +++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c @@ -25,22 +25,22 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/glob-util.h" -#include "basic/hashmap.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/special.h" -#include "basic/strv.h" -#include "basic/strxcpyx.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/pager.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/strxcpyx.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/pager.h" #include "analyze-verify.h" diff --git a/src/grp-system/grp-utils/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c index 5da779624d..0142803b46 100644 --- a/src/grp-system/grp-utils/systemd-delta/delta.c +++ b/src/grp-system/grp-utils/systemd-delta/delta.c @@ -24,23 +24,23 @@ #include <sys/prctl.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/hashmap.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/util.h" -#include "shared/pager.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.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/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/pager.h" static const char prefixes[] = "/etc\0" diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c index 70866cacda..f4b3a048e9 100644 --- a/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c +++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c @@ -23,26 +23,25 @@ #include <string.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/proc-cmdline.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "basic/virt.h" -#include "shared/fstab-util.h" -#include "shared/generator.h" - -#include "mount-setup.h" +#include "core/mount-setup.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/fstab-util.h" +#include "systemd-shared/generator.h" static const char *arg_dest = "/tmp"; static bool arg_fstab_enabled = true; diff --git a/src/grp-system/grp-utils/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c index 4aaf446177..a831d2e046 100644 --- a/src/grp-system/grp-utils/systemd-run/run.c +++ b/src/grp-system/grp-utils/systemd-run/run.c @@ -23,23 +23,23 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/calendarspec.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/signal-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/unit-name.h" -#include "basic/user-util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-unit-util.h" -#include "shared/bus-util.h" -#include "shared/ptyfwd.h" -#include "shared/spawn-polkit-agent.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/calendarspec.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-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/user-util.h" +#include "systemd-shared/bus-unit-util.h" +#include "systemd-shared/bus-util.h" +#include "systemd-shared/ptyfwd.h" +#include "systemd-shared/spawn-polkit-agent.h" static bool arg_ask_password = true; static bool arg_scope = false; diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c index de973034be..873cab1c5c 100644 --- a/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c +++ b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c @@ -23,24 +23,24 @@ #include <stdio.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/hashmap.h" -#include "basic/hexdecoct.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/set.h" -#include "basic/special.h" -#include "basic/stat-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "shared/install.h" -#include "shared/path-lookup.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/install.h" +#include "systemd-shared/path-lookup.h" static const struct { const char *path; |