diff options
Diffstat (limited to 'src/grp-initprogs')
21 files changed, 205 insertions, 203 deletions
diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c index 6380c297c2..6774df21c5 100644 --- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c @@ -20,15 +20,15 @@ #include <errno.h> #include <stdio.h> -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/proc-cmdline.h" -#include "basic/special.h" -#include "basic/string-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" -#include "shared/fstab-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/fstab-util.h" static const char *arg_dest = "/tmp"; static char *arg_resume_dev = NULL; diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c index 64d14bf64b..f41c6afef0 100644 --- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c @@ -21,10 +21,10 @@ #include <stdio.h> #include <sys/stat.h> -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" int main(int argc, char *argv[]) { struct stat st; diff --git a/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c index e9e84bc893..16ae4c7314 100644 --- a/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c +++ b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c @@ -24,14 +24,14 @@ #include <systemd/sd-messages.h> -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/sleep-config.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/sleep-config.h" static char* arg_verb = NULL; diff --git a/src/grp-initprogs/systemd-backlight/backlight.c b/src/grp-initprogs/systemd-backlight/backlight.c index aa8d852024..3fd47ad611 100644 --- a/src/grp-initprogs/systemd-backlight/backlight.c +++ b/src/grp-initprogs/systemd-backlight/backlight.c @@ -19,16 +19,16 @@ #include <libudev.h> -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/escape.h" -#include "basic/fileio.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/proc-cmdline.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/udev-util.h" static struct udev_device *find_pci_or_platform_parent(struct udev_device *device) { struct udev_device *parent; diff --git a/src/grp-initprogs/systemd-binfmt/binfmt.c b/src/grp-initprogs/systemd-binfmt/binfmt.c index 39bbdb5335..f569d117df 100644 --- a/src/grp-initprogs/systemd-binfmt/binfmt.c +++ b/src/grp-initprogs/systemd-binfmt/binfmt.c @@ -25,15 +25,15 @@ #include <stdlib.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static const char conf_file_dirs[] = CONF_PATHS_NULSTR("binfmt.d"); diff --git a/src/grp-initprogs/systemd-detect-virt/detect-virt.c b/src/grp-initprogs/systemd-detect-virt/detect-virt.c index 06cdab5297..80f4f72fab 100644 --- a/src/grp-initprogs/systemd-detect-virt/detect-virt.c +++ b/src/grp-initprogs/systemd-detect-virt/detect-virt.c @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdlib.h> -#include "basic/util.h" -#include "basic/virt.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" static bool arg_quiet = false; static enum { diff --git a/src/grp-initprogs/systemd-firstboot/firstboot.c b/src/grp-initprogs/systemd-firstboot/firstboot.c index 7308e108e8..4ed3c23419 100644 --- a/src/grp-initprogs/systemd-firstboot/firstboot.c +++ b/src/grp-initprogs/systemd-firstboot/firstboot.c @@ -22,24 +22,24 @@ #include <shadow.h> #include <unistd.h> -#include "basic/alloc-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/locale-util.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/random-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/terminal-util.h" -#include "basic/time-util.h" -#include "basic/umask-util.h" -#include "basic/user-util.h" -#include "shared/ask-password-api.h" +#include "systemd-basic/alloc-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/locale-util.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/time-util.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/ask-password-api.h" static char *arg_root = NULL; static char *arg_locale = NULL; /* $LANG */ diff --git a/src/grp-initprogs/systemd-fsck/Makefile b/src/grp-initprogs/systemd-fsck/Makefile index 8a223a7f70..1f331bca73 100644 --- a/src/grp-initprogs/systemd-fsck/Makefile +++ b/src/grp-initprogs/systemd-fsck/Makefile @@ -28,6 +28,7 @@ systemd_fsck_SOURCES = \ src/fsck/fsck.c systemd_fsck_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/systemd-fsck/fsck.c b/src/grp-initprogs/systemd-fsck/fsck.c index 4ca018763f..c33d199ef5 100644 --- a/src/grp-initprogs/systemd-fsck/fsck.c +++ b/src/grp-initprogs/systemd-fsck/fsck.c @@ -29,23 +29,23 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/proc-cmdline.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/socket-util.h" -#include "basic/special.h" -#include "basic/stdio-util.h" -#include "basic/util.h" #include "sd-bus/bus-common-errors.h" #include "sd-bus/bus-error.h" +#include "sd-bus/bus-util.h" #include "sd-device/device-util.h" -#include "sd-device/sd-device.h" -#include "shared/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/special.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/util.h" +#include "systemd-staging/sd-device.h" /* exit codes as defined in fsck(8) */ enum { diff --git a/src/grp-initprogs/systemd-modules-load/modules-load.c b/src/grp-initprogs/systemd-modules-load/modules-load.c index d7ea7886c6..13f6ac529d 100644 --- a/src/grp-initprogs/systemd-modules-load/modules-load.c +++ b/src/grp-initprogs/systemd-modules-load/modules-load.c @@ -24,15 +24,15 @@ #include <string.h> #include <sys/stat.h> -#include "basic/conf-files.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/proc-cmdline.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static char **arg_proc_cmdline_modules = NULL; diff --git a/src/grp-initprogs/systemd-quotacheck/quotacheck.c b/src/grp-initprogs/systemd-quotacheck/quotacheck.c index 3c2292b0c4..eadd78c9da 100644 --- a/src/grp-initprogs/systemd-quotacheck/quotacheck.c +++ b/src/grp-initprogs/systemd-quotacheck/quotacheck.c @@ -23,11 +23,11 @@ #include <sys/prctl.h> #include <unistd.h> -#include "basic/proc-cmdline.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static bool arg_skip = false; static bool arg_force = false; diff --git a/src/grp-initprogs/systemd-random-seed/random-seed.c b/src/grp-initprogs/systemd-random-seed/random-seed.c index 7fea6069f3..83415ffb4c 100644 --- a/src/grp-initprogs/systemd-random-seed/random-seed.c +++ b/src/grp-initprogs/systemd-random-seed/random-seed.c @@ -23,13 +23,13 @@ #include <sys/stat.h> #include <unistd.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/log.h" -#include "basic/mkdir.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #define POOL_SIZE_MIN 512 diff --git a/src/grp-initprogs/systemd-rfkill/rfkill.c b/src/grp-initprogs/systemd-rfkill/rfkill.c index 86779e9ac8..6a463d0f92 100644 --- a/src/grp-initprogs/systemd-rfkill/rfkill.c +++ b/src/grp-initprogs/systemd-rfkill/rfkill.c @@ -24,18 +24,18 @@ #include <libudev.h> #include <systemd/sd-daemon.h> -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/io-util.h" -#include "basic/mkdir.h" -#include "basic/parse-util.h" -#include "basic/proc-cmdline.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/udev-util.h" #define EXIT_USEC (5 * USEC_PER_SEC) diff --git a/src/grp-initprogs/systemd-sysctl/sysctl.c b/src/grp-initprogs/systemd-sysctl/sysctl.c index c44aa0aabb..c5d666904d 100644 --- a/src/grp-initprogs/systemd-sysctl/sysctl.c +++ b/src/grp-initprogs/systemd-sysctl/sysctl.c @@ -25,17 +25,17 @@ #include <stdlib.h> #include <string.h> -#include "basic/conf-files.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/hashmap.h" -#include "basic/log.h" -#include "basic/path-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/sysctl-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/log.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/sysctl-util.h" static char **arg_prefixes = NULL; diff --git a/src/grp-initprogs/systemd-sysusers/sysusers.c b/src/grp-initprogs/systemd-sysusers/sysusers.c index 55ff36410d..020ddbdf5e 100644 --- a/src/grp-initprogs/systemd-sysusers/sysusers.c +++ b/src/grp-initprogs/systemd-sysusers/sysusers.c @@ -24,24 +24,24 @@ #include <shadow.h> #include <utmp.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/copy.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio-label.h" -#include "basic/formats-util.h" -#include "basic/hashmap.h" -#include "basic/path-util.h" -#include "basic/selinux-util.h" -#include "basic/smack-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" -#include "basic/utf8.h" -#include "basic/util.h" -#include "shared/specifier.h" -#include "shared/uid-range.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio-label.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-shared/specifier.h" +#include "systemd-shared/uid-range.h" typedef enum ItemType { ADD_USER = 'u', diff --git a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c index 73f578572f..a371b11734 100644 --- a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c +++ b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c @@ -37,41 +37,41 @@ #include <linux/fs.h> -#include "basic/alloc-util.h" -#include "basic/btrfs-util.h" -#include "basic/capability-util.h" -#include "basic/chattr-util.h" -#include "basic/conf-files.h" -#include "basic/copy.h" -#include "basic/def.h" -#include "basic/escape.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/glob-util.h" -#include "basic/io-util.h" -#include "basic/label.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/missing.h" -#include "basic/mkdir.h" -#include "basic/mount-util.h" -#include "basic/parse-util.h" -#include "basic/path-util.h" -#include "basic/rm-rf.h" -#include "basic/selinux-util.h" -#include "basic/set.h" -#include "basic/stat-util.h" -#include "basic/stdio-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/umask-util.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/acl-util.h" -#include "shared/specifier.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/chattr-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/def.h" +#include "systemd-basic/escape.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/glob-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/label.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/missing.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/rm-rf.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/umask-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/acl-util.h" +#include "systemd-shared/specifier.h" /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create diff --git a/src/grp-initprogs/systemd-update-done/update-done.c b/src/grp-initprogs/systemd-update-done/update-done.c index 39d19ec048..79f755b909 100644 --- a/src/grp-initprogs/systemd-update-done/update-done.c +++ b/src/grp-initprogs/systemd-update-done/update-done.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/selinux-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/util.h" #define MESSAGE \ "This file was created by systemd-update-done. Its only \n" \ diff --git a/src/grp-initprogs/systemd-update-utmp/Makefile b/src/grp-initprogs/systemd-update-utmp/Makefile index 506e4840a5..550948589c 100644 --- a/src/grp-initprogs/systemd-update-utmp/Makefile +++ b/src/grp-initprogs/systemd-update-utmp/Makefile @@ -35,6 +35,7 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la \ $(AUDIT_LIBS) diff --git a/src/grp-initprogs/systemd-update-utmp/update-utmp.c b/src/grp-initprogs/systemd-update-utmp/update-utmp.c index cceb34f60d..ccb8543cfe 100644 --- a/src/grp-initprogs/systemd-update-utmp/update-utmp.c +++ b/src/grp-initprogs/systemd-update-utmp/update-utmp.c @@ -27,16 +27,16 @@ #include <systemd/sd-bus.h> -#include "basic/alloc-util.h" -#include "basic/formats-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/special.h" -#include "basic/unit-name.h" -#include "basic/util.h" #include "sd-bus/bus-error.h" -#include "shared/bus-util.h" -#include "shared/utmp-wtmp.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/special.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/utmp-wtmp.h" typedef struct Context { sd_bus *bus; diff --git a/src/grp-initprogs/systemd-user-sessions/user-sessions.c b/src/grp-initprogs/systemd-user-sessions/user-sessions.c index 639c0200e6..3ccb419aee 100644 --- a/src/grp-initprogs/systemd-user-sessions/user-sessions.c +++ b/src/grp-initprogs/systemd-user-sessions/user-sessions.c @@ -20,12 +20,12 @@ #include <errno.h> #include <unistd.h> -#include "basic/fileio-label.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/selinux-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/fileio-label.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" int main(int argc, char*argv[]) { diff --git a/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c index 87c0c2f066..7edab74051 100644 --- a/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c +++ b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c @@ -30,19 +30,19 @@ #include <linux/tiocl.h> #include <linux/vt.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/io-util.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/process-util.h" -#include "basic/signal-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" -#include "basic/virt.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" static bool is_vconsole(int fd) { unsigned char data[1]; |