From 240c9b88c27c7ab9fd41837b242e3dcc2d059e52 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Wed, 11 Apr 2012 12:59:52 +0200
Subject: [PATCH] move libsystemd_core.la sources into core/ (cherry picked
from commit b30e2f4c18ad81b04e4314fd191a5d458553773c)
Conflicts:
Makefile.am
---
Makefile.am | 241 +++++++++++++++++++------------------
po/POTFILES.skip | 26 ++--
src/{ => core}/ask-password-api.h | 0
src/{ => core}/automount.c | 0
src/{ => core}/automount.h | 0
src/{ => core}/build.h | 0
src/{ => core}/bus-errors.h | 0
src/{ => core}/cgroup-attr.c | 0
src/{ => core}/cgroup-attr.h | 0
src/{ => core}/cgroup.c | 0
src/{ => core}/cgroup.h | 0
src/{ => core}/condition.c | 0
src/{ => core}/condition.h | 0
src/{ => core}/dbus-automount.c | 0
src/{ => core}/dbus-automount.h | 0
src/{ => core}/dbus-device.c | 0
src/{ => core}/dbus-device.h | 0
src/{ => core}/dbus-execute.c | 0
src/{ => core}/dbus-execute.h | 0
src/{ => core}/dbus-job.c | 0
src/{ => core}/dbus-job.h | 0
src/{ => core}/dbus-loop.h | 0
src/{ => core}/dbus-manager.c | 0
src/{ => core}/dbus-manager.h | 0
src/{ => core}/dbus-mount.c | 0
src/{ => core}/dbus-mount.h | 0
src/{ => core}/dbus-path.c | 0
src/{ => core}/dbus-path.h | 0
src/{ => core}/dbus-service.c | 0
src/{ => core}/dbus-service.h | 0
src/{ => core}/dbus-snapshot.c | 0
src/{ => core}/dbus-snapshot.h | 0
src/{ => core}/dbus-socket.c | 0
src/{ => core}/dbus-socket.h | 0
src/{ => core}/dbus-swap.c | 0
src/{ => core}/dbus-swap.h | 0
src/{ => core}/dbus-target.c | 0
src/{ => core}/dbus-target.h | 0
src/{ => core}/dbus-timer.c | 0
src/{ => core}/dbus-timer.h | 0
src/{ => core}/dbus-unit.c | 0
src/{ => core}/dbus-unit.h | 0
src/{ => core}/dbus.c | 0
src/{ => core}/dbus.h | 0
src/{ => core}/device.c | 0
src/{ => core}/device.h | 0
src/{ => core}/execute.c | 0
src/{ => core}/execute.h | 0
src/{ => core}/fdset.c | 0
src/{ => core}/fdset.h | 0
src/{ => core}/ima-setup.c | 0
src/{ => core}/ima-setup.h | 0
src/{ => core}/initreq.h | 0
src/{ => core}/job.c | 0
src/{ => core}/job.h | 0
src/{ => core}/kmod-setup.c | 0
src/{ => core}/kmod-setup.h | 0
src/{ => core}/load-dropin.c | 0
src/{ => core}/load-dropin.h | 0
src/{ => core}/load-fragment.c | 0
src/{ => core}/load-fragment.h | 0
src/{ => core}/locale-setup.c | 0
src/{ => core}/locale-setup.h | 0
src/{ => core}/manager.c | 0
src/{ => core}/manager.h | 0
src/{ => core}/mount.c | 0
src/{ => core}/mount.h | 0
src/{ => core}/namespace.c | 0
src/{ => core}/namespace.h | 0
src/{ => core}/path.c | 0
src/{ => core}/path.h | 0
src/{ => core}/polkit.h | 0
src/{ => core}/securebits.h | 0
src/{ => core}/selinux-setup.c | 0
src/{ => core}/selinux-setup.h | 0
src/{ => core}/service.c | 0
src/{ => core}/service.h | 0
src/{ => core}/snapshot.c | 0
src/{ => core}/snapshot.h | 0
src/{ => core}/socket.c | 0
src/{ => core}/socket.h | 0
src/{ => core}/spawn-agent.h | 0
src/{ => core}/special.h | 0
src/{ => core}/swap.c | 0
src/{ => core}/swap.h | 0
src/{ => core}/sysfs-show.h | 0
src/{ => core}/target.c | 0
src/{ => core}/target.h | 0
src/{ => core}/tcpwrap.c | 0
src/{ => core}/tcpwrap.h | 0
src/{ => core}/timer.c | 0
src/{ => core}/timer.h | 0
src/{ => core}/unit.c | 0
src/{ => core}/unit.h | 0
94 files changed, 135 insertions(+), 132 deletions(-)
rename src/{ => core}/ask-password-api.h (100%)
rename src/{ => core}/automount.c (100%)
rename src/{ => core}/automount.h (100%)
rename src/{ => core}/build.h (100%)
rename src/{ => core}/bus-errors.h (100%)
rename src/{ => core}/cgroup-attr.c (100%)
rename src/{ => core}/cgroup-attr.h (100%)
rename src/{ => core}/cgroup.c (100%)
rename src/{ => core}/cgroup.h (100%)
rename src/{ => core}/condition.c (100%)
rename src/{ => core}/condition.h (100%)
rename src/{ => core}/dbus-automount.c (100%)
rename src/{ => core}/dbus-automount.h (100%)
rename src/{ => core}/dbus-device.c (100%)
rename src/{ => core}/dbus-device.h (100%)
rename src/{ => core}/dbus-execute.c (100%)
rename src/{ => core}/dbus-execute.h (100%)
rename src/{ => core}/dbus-job.c (100%)
rename src/{ => core}/dbus-job.h (100%)
rename src/{ => core}/dbus-loop.h (100%)
rename src/{ => core}/dbus-manager.c (100%)
rename src/{ => core}/dbus-manager.h (100%)
rename src/{ => core}/dbus-mount.c (100%)
rename src/{ => core}/dbus-mount.h (100%)
rename src/{ => core}/dbus-path.c (100%)
rename src/{ => core}/dbus-path.h (100%)
rename src/{ => core}/dbus-service.c (100%)
rename src/{ => core}/dbus-service.h (100%)
rename src/{ => core}/dbus-snapshot.c (100%)
rename src/{ => core}/dbus-snapshot.h (100%)
rename src/{ => core}/dbus-socket.c (100%)
rename src/{ => core}/dbus-socket.h (100%)
rename src/{ => core}/dbus-swap.c (100%)
rename src/{ => core}/dbus-swap.h (100%)
rename src/{ => core}/dbus-target.c (100%)
rename src/{ => core}/dbus-target.h (100%)
rename src/{ => core}/dbus-timer.c (100%)
rename src/{ => core}/dbus-timer.h (100%)
rename src/{ => core}/dbus-unit.c (100%)
rename src/{ => core}/dbus-unit.h (100%)
rename src/{ => core}/dbus.c (100%)
rename src/{ => core}/dbus.h (100%)
rename src/{ => core}/device.c (100%)
rename src/{ => core}/device.h (100%)
rename src/{ => core}/execute.c (100%)
rename src/{ => core}/execute.h (100%)
rename src/{ => core}/fdset.c (100%)
rename src/{ => core}/fdset.h (100%)
rename src/{ => core}/ima-setup.c (100%)
rename src/{ => core}/ima-setup.h (100%)
rename src/{ => core}/initreq.h (100%)
rename src/{ => core}/job.c (100%)
rename src/{ => core}/job.h (100%)
rename src/{ => core}/kmod-setup.c (100%)
rename src/{ => core}/kmod-setup.h (100%)
rename src/{ => core}/load-dropin.c (100%)
rename src/{ => core}/load-dropin.h (100%)
rename src/{ => core}/load-fragment.c (100%)
rename src/{ => core}/load-fragment.h (100%)
rename src/{ => core}/locale-setup.c (100%)
rename src/{ => core}/locale-setup.h (100%)
rename src/{ => core}/manager.c (100%)
rename src/{ => core}/manager.h (100%)
rename src/{ => core}/mount.c (100%)
rename src/{ => core}/mount.h (100%)
rename src/{ => core}/namespace.c (100%)
rename src/{ => core}/namespace.h (100%)
rename src/{ => core}/path.c (100%)
rename src/{ => core}/path.h (100%)
rename src/{ => core}/polkit.h (100%)
rename src/{ => core}/securebits.h (100%)
rename src/{ => core}/selinux-setup.c (100%)
rename src/{ => core}/selinux-setup.h (100%)
rename src/{ => core}/service.c (100%)
rename src/{ => core}/service.h (100%)
rename src/{ => core}/snapshot.c (100%)
rename src/{ => core}/snapshot.h (100%)
rename src/{ => core}/socket.c (100%)
rename src/{ => core}/socket.h (100%)
rename src/{ => core}/spawn-agent.h (100%)
rename src/{ => core}/special.h (100%)
rename src/{ => core}/swap.c (100%)
rename src/{ => core}/swap.h (100%)
rename src/{ => core}/sysfs-show.h (100%)
rename src/{ => core}/target.c (100%)
rename src/{ => core}/target.h (100%)
rename src/{ => core}/tcpwrap.c (100%)
rename src/{ => core}/tcpwrap.h (100%)
rename src/{ => core}/timer.c (100%)
rename src/{ => core}/timer.h (100%)
rename src/{ => core}/unit.c (100%)
rename src/{ => core}/unit.h (100%)
diff --git a/Makefile.am b/Makefile.am
index 27a283e..161d44e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,8 @@ AM_CPPFLAGS = \
-I $(top_srcdir)/src/readahead \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/journal \
- -I $(top_srcdir)/src/systemd
+ -I $(top_srcdir)/src/systemd \
+ -I $(top_srcdir)/src/core
AM_CFLAGS = $(WARNINGFLAGS)
AM_LDFLAGS = $(GCLDFLAGS)
@@ -636,128 +637,124 @@ noinst_LTLIBRARIES += \
libsystemd-core.la
libsystemd_core_la_SOURCES = \
- src/unit.c \
- src/unit.h \
- src/job.c \
- src/job.h \
- src/manager.c \
- src/manager.h \
- src/path-lookup.c \
- src/path-lookup.h \
- src/load-fragment.c \
- src/load-fragment.h \
- src/service.c \
- src/service.h \
- src/automount.c \
- src/automount.h \
- src/mount.c \
- src/mount.h \
- src/swap.c \
- src/swap.h \
- src/device.c \
- src/device.h \
- src/target.c \
- src/target.h \
- src/snapshot.c \
- src/snapshot.h \
- src/socket.c \
- src/socket.h \
- src/timer.c \
- src/timer.h \
- src/path.c \
- src/path.h \
- src/load-dropin.c \
- src/load-dropin.h \
- src/execute.c \
- src/execute.h \
- src/utmp-wtmp.c \
- src/utmp-wtmp.h \
- src/dbus.c \
- src/dbus.h \
- src/dbus-manager.c \
- src/dbus-manager.h \
- src/dbus-unit.c \
- src/dbus-unit.h \
- src/dbus-job.c \
- src/dbus-job.h \
- src/dbus-service.c \
- src/dbus-service.h \
- src/dbus-socket.c \
- src/dbus-socket.h \
- src/dbus-timer.c \
- src/dbus-timer.h \
- src/dbus-target.c \
- src/dbus-target.h \
- src/dbus-mount.c \
- src/dbus-mount.h \
- src/dbus-automount.c \
- src/dbus-automount.h \
- src/dbus-swap.c \
- src/dbus-swap.h \
- src/dbus-snapshot.c \
- src/dbus-snapshot.h \
- src/dbus-device.c \
- src/dbus-device.h \
- src/dbus-execute.c \
- src/dbus-execute.h \
- src/dbus-path.c \
- src/dbus-path.h \
- src/cgroup.c \
- src/cgroup.h \
- src/mount-setup.c \
- src/mount-setup.h \
- src/hostname-setup.c \
- src/hostname-setup.h \
- src/selinux-setup.c \
- src/selinux-setup.h \
- src/ima-setup.c \
- src/ima-setup.h \
- src/loopback-setup.h \
- src/loopback-setup.c \
- src/kmod-setup.c \
- src/kmod-setup.h \
- src/locale-setup.h \
- src/locale-setup.c \
- src/machine-id-setup.c \
- src/machine-id-setup.h \
- src/fdset.c \
- src/fdset.h \
- src/condition.c \
- src/condition.h \
+ src/def.h \
+ src/missing.h \
src/dbus-common.c \
src/dbus-common.h \
- src/install.c \
- src/install.h \
+ src/watchdog.c \
+ src/watchdog.h \
+ src/loopback-setup.h \
+ src/loopback-setup.c \
+ src/hostname-setup.c \
+ src/hostname-setup.h \
src/specifier.c \
src/specifier.h \
- src/namespace.c \
- src/namespace.h \
+ src/install.c \
+ src/install.h \
+ src/path-lookup.c \
+ src/path-lookup.h \
src/unit-name.c \
src/unit-name.h \
- src/tcpwrap.c \
- src/tcpwrap.h \
- src/cgroup-attr.c \
- src/cgroup-attr.h \
- src/watchdog.c \
- src/watchdog.h \
- src/def.h \
- src/missing.h \
- src/securebits.h \
+ src/utmp-wtmp.c \
+ src/utmp-wtmp.h \
+ src/machine-id-setup.c \
+ src/machine-id-setup.h \
+ src/mount-setup.c \
+ src/mount-setup.h \
src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \
- src/initreq.h \
- src/special.h \
- src/dbus-common.h \
- src/bus-errors.h \
- src/cgroup-show.h \
- src/build.h \
- src/umount.h \
- src/ask-password-api.h \
- src/sysfs-show.h \
- src/polkit.h \
- src/dbus-loop.h \
- src/spawn-agent.h \
- src/logs-show.h
+ src/core/unit.c \
+ src/core/unit.h \
+ src/core/job.c \
+ src/core/job.h \
+ src/core/manager.c \
+ src/core/manager.h \
+ src/core/load-fragment.c \
+ src/core/load-fragment.h \
+ src/core/service.c \
+ src/core/service.h \
+ src/core/automount.c \
+ src/core/automount.h \
+ src/core/mount.c \
+ src/core/mount.h \
+ src/core/swap.c \
+ src/core/swap.h \
+ src/core/device.c \
+ src/core/device.h \
+ src/core/target.c \
+ src/core/target.h \
+ src/core/snapshot.c \
+ src/core/snapshot.h \
+ src/core/socket.c \
+ src/core/socket.h \
+ src/core/timer.c \
+ src/core/timer.h \
+ src/core/path.c \
+ src/core/path.h \
+ src/core/load-dropin.c \
+ src/core/load-dropin.h \
+ src/core/execute.c \
+ src/core/execute.h \
+ src/core/dbus.c \
+ src/core/dbus.h \
+ src/core/dbus-manager.c \
+ src/core/dbus-manager.h \
+ src/core/dbus-unit.c \
+ src/core/dbus-unit.h \
+ src/core/dbus-job.c \
+ src/core/dbus-job.h \
+ src/core/dbus-service.c \
+ src/core/dbus-service.h \
+ src/core/dbus-socket.c \
+ src/core/dbus-socket.h \
+ src/core/dbus-timer.c \
+ src/core/dbus-timer.h \
+ src/core/dbus-target.c \
+ src/core/dbus-target.h \
+ src/core/dbus-mount.c \
+ src/core/dbus-mount.h \
+ src/core/dbus-automount.c \
+ src/core/dbus-automount.h \
+ src/core/dbus-swap.c \
+ src/core/dbus-swap.h \
+ src/core/dbus-snapshot.c \
+ src/core/dbus-snapshot.h \
+ src/core/dbus-device.c \
+ src/core/dbus-device.h \
+ src/core/dbus-execute.c \
+ src/core/dbus-execute.h \
+ src/core/dbus-path.c \
+ src/core/dbus-path.h \
+ src/core/cgroup.c \
+ src/core/cgroup.h \
+ src/core/selinux-setup.c \
+ src/core/selinux-setup.h \
+ src/core/ima-setup.c \
+ src/core/ima-setup.h \
+ src/core/kmod-setup.c \
+ src/core/kmod-setup.h \
+ src/core/locale-setup.h \
+ src/core/locale-setup.c \
+ src/core/fdset.c \
+ src/core/fdset.h \
+ src/core/condition.c \
+ src/core/condition.h \
+ src/core/namespace.c \
+ src/core/namespace.h \
+ src/core/tcpwrap.c \
+ src/core/tcpwrap.h \
+ src/core/cgroup-attr.c \
+ src/core/cgroup-attr.h \
+ src/core/securebits.h \
+ src/core/initreq.h \
+ src/core/special.h \
+ src/core/bus-errors.h \
+ src/core/build.h \
+ src/core/ask-password-api.h \
+ src/core/sysfs-show.h \
+ src/core/polkit.h \
+ src/core/dbus-loop.h \
+ src/core/spawn-agent.h
nodist_libsystemd_core_la_SOURCES = \
src/load-fragment-gperf.c \
@@ -939,6 +936,7 @@ pkginclude_HEADERS += \
systemd_shutdown_SOURCES = \
src/mount-setup.c \
src/umount.c \
+ src/umount.h \
src/shutdown.c \
src/watchdog.c \
src/watchdog.h
@@ -1075,10 +1073,12 @@ systemctl_SOURCES = \
src/dbus-common.c \
src/path-lookup.c \
src/cgroup-show.c \
+ src/cgroup-show.h \
src/unit-name.c \
src/install.c \
src/spawn-agent.c \
- src/logs-show.c
+ src/logs-show.c \
+ src/logs-show.h
systemctl_CFLAGS = \
$(AM_CFLAGS) \
@@ -1120,7 +1120,8 @@ systemd_reply_password_LDADD = \
# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
src/cgls.c \
- src/cgroup-show.c
+ src/cgroup-show.c \
+ src/cgroup-show.h
systemd_cgls_LDADD = \
libsystemd-shared.la
@@ -1387,7 +1388,8 @@ systemd_cat_LDADD = \
journalctl_SOURCES = \
src/journal/journalctl.c \
- src/logs-show.c
+ src/logs-show.c \
+ src/logs-show.h
journalctl_LDADD = \
libsystemd-shared.la \
@@ -2011,7 +2013,8 @@ loginctl_SOURCES = \
src/login/loginctl.c \
src/login/sysfs-show.c \
src/dbus-common.c \
- src/cgroup-show.c
+ src/cgroup-show.c \
+ src/cgroup-show.h
loginctl_CFLAGS = \
$(AM_CFLAGS) \
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5a5d027..2acacbb 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,16 +1,16 @@
-src/dbus-automount.c
-src/dbus-device.c
-src/dbus-job.c
-src/dbus-manager.c
-src/dbus-mount.c
-src/dbus-path.c
-src/dbus-service.c
-src/dbus-snapshot.c
-src/dbus-socket.c
-src/dbus-swap.c
-src/dbus-target.c
-src/dbus-timer.c
-src/dbus-unit.c
+src/core/dbus-automount.c
+src/core/dbus-device.c
+src/core/dbus-job.c
+src/core/dbus-manager.c
+src/core/dbus-mount.c
+src/core/dbus-path.c
+src/core/dbus-service.c
+src/core/dbus-snapshot.c
+src/core/dbus-socket.c
+src/core/dbus-swap.c
+src/core/dbus-target.c
+src/core/dbus-timer.c
+src/core/dbus-unit.c
src/hostname/hostnamed.c
src/locale/localed.c
src/org.freedesktop.systemd1.policy.in.in
diff --git a/src/ask-password-api.h b/src/core/ask-password-api.h
similarity index 100%
rename from src/ask-password-api.h
rename to src/core/ask-password-api.h
diff --git a/src/automount.c b/src/core/automount.c
similarity index 100%
rename from src/automount.c
rename to src/core/automount.c
diff --git a/src/automount.h b/src/core/automount.h
similarity index 100%
rename from src/automount.h
rename to src/core/automount.h
diff --git a/src/build.h b/src/core/build.h
similarity index 100%
rename from src/build.h
rename to src/core/build.h
diff --git a/src/bus-errors.h b/src/core/bus-errors.h
similarity index 100%
rename from src/bus-errors.h
rename to src/core/bus-errors.h
diff --git a/src/cgroup-attr.c b/src/core/cgroup-attr.c
similarity index 100%
rename from src/cgroup-attr.c
rename to src/core/cgroup-attr.c
diff --git a/src/cgroup-attr.h b/src/core/cgroup-attr.h
similarity index 100%
rename from src/cgroup-attr.h
rename to src/core/cgroup-attr.h
diff --git a/src/cgroup.c b/src/core/cgroup.c
similarity index 100%
rename from src/cgroup.c
rename to src/core/cgroup.c
diff --git a/src/cgroup.h b/src/core/cgroup.h
similarity index 100%
rename from src/cgroup.h
rename to src/core/cgroup.h
diff --git a/src/condition.c b/src/core/condition.c
similarity index 100%
rename from src/condition.c
rename to src/core/condition.c
diff --git a/src/condition.h b/src/core/condition.h
similarity index 100%
rename from src/condition.h
rename to src/core/condition.h
diff --git a/src/dbus-automount.c b/src/core/dbus-automount.c
similarity index 100%
rename from src/dbus-automount.c
rename to src/core/dbus-automount.c
diff --git a/src/dbus-automount.h b/src/core/dbus-automount.h
similarity index 100%
rename from src/dbus-automount.h
rename to src/core/dbus-automount.h
diff --git a/src/dbus-device.c b/src/core/dbus-device.c
similarity index 100%
rename from src/dbus-device.c
rename to src/core/dbus-device.c
diff --git a/src/dbus-device.h b/src/core/dbus-device.h
similarity index 100%
rename from src/dbus-device.h
rename to src/core/dbus-device.h
diff --git a/src/dbus-execute.c b/src/core/dbus-execute.c
similarity index 100%
rename from src/dbus-execute.c
rename to src/core/dbus-execute.c
diff --git a/src/dbus-execute.h b/src/core/dbus-execute.h
similarity index 100%
rename from src/dbus-execute.h
rename to src/core/dbus-execute.h
diff --git a/src/dbus-job.c b/src/core/dbus-job.c
similarity index 100%
rename from src/dbus-job.c
rename to src/core/dbus-job.c
diff --git a/src/dbus-job.h b/src/core/dbus-job.h
similarity index 100%
rename from src/dbus-job.h
rename to src/core/dbus-job.h
diff --git a/src/dbus-loop.h b/src/core/dbus-loop.h
similarity index 100%
rename from src/dbus-loop.h
rename to src/core/dbus-loop.h
diff --git a/src/dbus-manager.c b/src/core/dbus-manager.c
similarity index 100%
rename from src/dbus-manager.c
rename to src/core/dbus-manager.c
diff --git a/src/dbus-manager.h b/src/core/dbus-manager.h
similarity index 100%
rename from src/dbus-manager.h
rename to src/core/dbus-manager.h
diff --git a/src/dbus-mount.c b/src/core/dbus-mount.c
similarity index 100%
rename from src/dbus-mount.c
rename to src/core/dbus-mount.c
diff --git a/src/dbus-mount.h b/src/core/dbus-mount.h
similarity index 100%
rename from src/dbus-mount.h
rename to src/core/dbus-mount.h
diff --git a/src/dbus-path.c b/src/core/dbus-path.c
similarity index 100%
rename from src/dbus-path.c
rename to src/core/dbus-path.c
diff --git a/src/dbus-path.h b/src/core/dbus-path.h
similarity index 100%
rename from src/dbus-path.h
rename to src/core/dbus-path.h
diff --git a/src/dbus-service.c b/src/core/dbus-service.c
similarity index 100%
rename from src/dbus-service.c
rename to src/core/dbus-service.c
diff --git a/src/dbus-service.h b/src/core/dbus-service.h
similarity index 100%
rename from src/dbus-service.h
rename to src/core/dbus-service.h
diff --git a/src/dbus-snapshot.c b/src/core/dbus-snapshot.c
similarity index 100%
rename from src/dbus-snapshot.c
rename to src/core/dbus-snapshot.c
diff --git a/src/dbus-snapshot.h b/src/core/dbus-snapshot.h
similarity index 100%
rename from src/dbus-snapshot.h
rename to src/core/dbus-snapshot.h
diff --git a/src/dbus-socket.c b/src/core/dbus-socket.c
similarity index 100%
rename from src/dbus-socket.c
rename to src/core/dbus-socket.c
diff --git a/src/dbus-socket.h b/src/core/dbus-socket.h
similarity index 100%
rename from src/dbus-socket.h
rename to src/core/dbus-socket.h
diff --git a/src/dbus-swap.c b/src/core/dbus-swap.c
similarity index 100%
rename from src/dbus-swap.c
rename to src/core/dbus-swap.c
diff --git a/src/dbus-swap.h b/src/core/dbus-swap.h
similarity index 100%
rename from src/dbus-swap.h
rename to src/core/dbus-swap.h
diff --git a/src/dbus-target.c b/src/core/dbus-target.c
similarity index 100%
rename from src/dbus-target.c
rename to src/core/dbus-target.c
diff --git a/src/dbus-target.h b/src/core/dbus-target.h
similarity index 100%
rename from src/dbus-target.h
rename to src/core/dbus-target.h
diff --git a/src/dbus-timer.c b/src/core/dbus-timer.c
similarity index 100%
rename from src/dbus-timer.c
rename to src/core/dbus-timer.c
diff --git a/src/dbus-timer.h b/src/core/dbus-timer.h
similarity index 100%
rename from src/dbus-timer.h
rename to src/core/dbus-timer.h
diff --git a/src/dbus-unit.c b/src/core/dbus-unit.c
similarity index 100%
rename from src/dbus-unit.c
rename to src/core/dbus-unit.c
diff --git a/src/dbus-unit.h b/src/core/dbus-unit.h
similarity index 100%
rename from src/dbus-unit.h
rename to src/core/dbus-unit.h
diff --git a/src/dbus.c b/src/core/dbus.c
similarity index 100%
rename from src/dbus.c
rename to src/core/dbus.c
diff --git a/src/dbus.h b/src/core/dbus.h
similarity index 100%
rename from src/dbus.h
rename to src/core/dbus.h
diff --git a/src/device.c b/src/core/device.c
similarity index 100%
rename from src/device.c
rename to src/core/device.c
diff --git a/src/device.h b/src/core/device.h
similarity index 100%
rename from src/device.h
rename to src/core/device.h
diff --git a/src/execute.c b/src/core/execute.c
similarity index 100%
rename from src/execute.c
rename to src/core/execute.c
diff --git a/src/execute.h b/src/core/execute.h
similarity index 100%
rename from src/execute.h
rename to src/core/execute.h
diff --git a/src/fdset.c b/src/core/fdset.c
similarity index 100%
rename from src/fdset.c
rename to src/core/fdset.c
diff --git a/src/fdset.h b/src/core/fdset.h
similarity index 100%
rename from src/fdset.h
rename to src/core/fdset.h
diff --git a/src/ima-setup.c b/src/core/ima-setup.c
similarity index 100%
rename from src/ima-setup.c
rename to src/core/ima-setup.c
diff --git a/src/ima-setup.h b/src/core/ima-setup.h
similarity index 100%
rename from src/ima-setup.h
rename to src/core/ima-setup.h
diff --git a/src/initreq.h b/src/core/initreq.h
similarity index 100%
rename from src/initreq.h
rename to src/core/initreq.h
diff --git a/src/job.c b/src/core/job.c
similarity index 100%
rename from src/job.c
rename to src/core/job.c
diff --git a/src/job.h b/src/core/job.h
similarity index 100%
rename from src/job.h
rename to src/core/job.h
diff --git a/src/kmod-setup.c b/src/core/kmod-setup.c
similarity index 100%
rename from src/kmod-setup.c
rename to src/core/kmod-setup.c
diff --git a/src/kmod-setup.h b/src/core/kmod-setup.h
similarity index 100%
rename from src/kmod-setup.h
rename to src/core/kmod-setup.h
diff --git a/src/load-dropin.c b/src/core/load-dropin.c
similarity index 100%
rename from src/load-dropin.c
rename to src/core/load-dropin.c
diff --git a/src/load-dropin.h b/src/core/load-dropin.h
similarity index 100%
rename from src/load-dropin.h
rename to src/core/load-dropin.h
diff --git a/src/load-fragment.c b/src/core/load-fragment.c
similarity index 100%
rename from src/load-fragment.c
rename to src/core/load-fragment.c
diff --git a/src/load-fragment.h b/src/core/load-fragment.h
similarity index 100%
rename from src/load-fragment.h
rename to src/core/load-fragment.h
diff --git a/src/locale-setup.c b/src/core/locale-setup.c
similarity index 100%
rename from src/locale-setup.c
rename to src/core/locale-setup.c
diff --git a/src/locale-setup.h b/src/core/locale-setup.h
similarity index 100%
rename from src/locale-setup.h
rename to src/core/locale-setup.h
diff --git a/src/manager.c b/src/core/manager.c
similarity index 100%
rename from src/manager.c
rename to src/core/manager.c
diff --git a/src/manager.h b/src/core/manager.h
similarity index 100%
rename from src/manager.h
rename to src/core/manager.h
diff --git a/src/mount.c b/src/core/mount.c
similarity index 100%
rename from src/mount.c
rename to src/core/mount.c
diff --git a/src/mount.h b/src/core/mount.h
similarity index 100%
rename from src/mount.h
rename to src/core/mount.h
diff --git a/src/namespace.c b/src/core/namespace.c
similarity index 100%
rename from src/namespace.c
rename to src/core/namespace.c
diff --git a/src/namespace.h b/src/core/namespace.h
similarity index 100%
rename from src/namespace.h
rename to src/core/namespace.h
diff --git a/src/path.c b/src/core/path.c
similarity index 100%
rename from src/path.c
rename to src/core/path.c
diff --git a/src/path.h b/src/core/path.h
similarity index 100%
rename from src/path.h
rename to src/core/path.h
diff --git a/src/polkit.h b/src/core/polkit.h
similarity index 100%
rename from src/polkit.h
rename to src/core/polkit.h
diff --git a/src/securebits.h b/src/core/securebits.h
similarity index 100%
rename from src/securebits.h
rename to src/core/securebits.h
diff --git a/src/selinux-setup.c b/src/core/selinux-setup.c
similarity index 100%
rename from src/selinux-setup.c
rename to src/core/selinux-setup.c
diff --git a/src/selinux-setup.h b/src/core/selinux-setup.h
similarity index 100%
rename from src/selinux-setup.h
rename to src/core/selinux-setup.h
diff --git a/src/service.c b/src/core/service.c
similarity index 100%
rename from src/service.c
rename to src/core/service.c
diff --git a/src/service.h b/src/core/service.h
similarity index 100%
rename from src/service.h
rename to src/core/service.h
diff --git a/src/snapshot.c b/src/core/snapshot.c
similarity index 100%
rename from src/snapshot.c
rename to src/core/snapshot.c
diff --git a/src/snapshot.h b/src/core/snapshot.h
similarity index 100%
rename from src/snapshot.h
rename to src/core/snapshot.h
diff --git a/src/socket.c b/src/core/socket.c
similarity index 100%
rename from src/socket.c
rename to src/core/socket.c
diff --git a/src/socket.h b/src/core/socket.h
similarity index 100%
rename from src/socket.h
rename to src/core/socket.h
diff --git a/src/spawn-agent.h b/src/core/spawn-agent.h
similarity index 100%
rename from src/spawn-agent.h
rename to src/core/spawn-agent.h
diff --git a/src/special.h b/src/core/special.h
similarity index 100%
rename from src/special.h
rename to src/core/special.h
diff --git a/src/swap.c b/src/core/swap.c
similarity index 100%
rename from src/swap.c
rename to src/core/swap.c
diff --git a/src/swap.h b/src/core/swap.h
similarity index 100%
rename from src/swap.h
rename to src/core/swap.h
diff --git a/src/sysfs-show.h b/src/core/sysfs-show.h
similarity index 100%
rename from src/sysfs-show.h
rename to src/core/sysfs-show.h
diff --git a/src/target.c b/src/core/target.c
similarity index 100%
rename from src/target.c
rename to src/core/target.c
diff --git a/src/target.h b/src/core/target.h
similarity index 100%
rename from src/target.h
rename to src/core/target.h
diff --git a/src/tcpwrap.c b/src/core/tcpwrap.c
similarity index 100%
rename from src/tcpwrap.c
rename to src/core/tcpwrap.c
diff --git a/src/tcpwrap.h b/src/core/tcpwrap.h
similarity index 100%
rename from src/tcpwrap.h
rename to src/core/tcpwrap.h
diff --git a/src/timer.c b/src/core/timer.c
similarity index 100%
rename from src/timer.c
rename to src/core/timer.c
diff --git a/src/timer.h b/src/core/timer.h
similarity index 100%
rename from src/timer.h
rename to src/core/timer.h
diff --git a/src/unit.c b/src/core/unit.c
similarity index 100%
rename from src/unit.c
rename to src/core/unit.c
diff --git a/src/unit.h b/src/core/unit.h
similarity index 100%
rename from src/unit.h
rename to src/core/unit.h