more

21 files changed, 16 insertions, 4 deletions

diff --git a/src/Makefile b/src/Makefile
index f8d5583359..b3c3bffb80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -81,15 +81,15 @@ at.subdirs += systemd-remount-fs
 at.subdirs += systemd-reply-password
 at.subdirs += systemd-rfkill
 at.subdirs += systemd-run
-#at.subdirs += systemd-shutdown
-#at.subdirs += systemd-sleep
+at.subdirs += systemd-shutdown
+at.subdirs += systemd-sleep
 at.subdirs += systemd-socket-proxyd
 at.subdirs += systemd-stdio-bridge
 at.subdirs += systemd-sysctl
-#at.subdirs += systemd-sysusers
+at.subdirs += systemd-sysusers
 at.subdirs += systemd-system-update-generator
 at.subdirs += systemd-sysv-generator
-#at.subdirs += systemd-timesync
+at.subdirs += systemd-timesyncd
 at.subdirs += systemd-tmpfiles
 at.subdirs += systemd-tty-ask-password-agent
 at.subdirs += systemd-update-done
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 99c716439f..41782b3c7e 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -36,4 +36,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\"
+systemd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-shutdown/killall.c b/src/systemd-shutdown/killall.c
new file mode 120000
index 0000000000..5ddb36306b
--- /dev/null
+++ b/src/systemd-shutdown/killall.c
@@ -0,0 +1 @@
+../libcore/killall.c
\ No newline at end of file
diff --git a/src/systemd-shutdown/killall.h b/src/systemd-shutdown/killall.h
new file mode 120000
index 0000000000..60b334fe91
--- /dev/null
+++ b/src/systemd-shutdown/killall.h
@@ -0,0 +1 @@
+../libcore/killall.h
\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.c b/src/systemd-shutdown/mount-setup.c
new file mode 120000
index 0000000000..a4ab487157
--- /dev/null
+++ b/src/systemd-shutdown/mount-setup.c
@@ -0,0 +1 @@
+../libcore/mount-setup.c
\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.h b/src/systemd-shutdown/mount-setup.h
new file mode 120000
index 0000000000..1f984851f8
--- /dev/null
+++ b/src/systemd-shutdown/mount-setup.h
@@ -0,0 +1 @@
+../libcore/mount-setup.h
\ No newline at end of file
diff --git a/src/libcore/shutdown.c b/src/systemd-shutdown/shutdown.c
index e14755d84e..e14755d84e 100644
--- a/src/libcore/shutdown.c
+++ b/src/systemd-shutdown/shutdown.c
diff --git a/src/libcore/umount.c b/src/systemd-shutdown/umount.c
index c21a2be54e..c21a2be54e 100644
--- a/src/libcore/umount.c
+++ b/src/systemd-shutdown/umount.c
diff --git a/src/libcore/umount.h b/src/systemd-shutdown/umount.h
index 4e2215a47d..4e2215a47d 100644
--- a/src/libcore/umount.h
+++ b/src/systemd-shutdown/umount.h
diff --git a/src/systemd-sleep/Makefile b/src/systemd-sleep/Makefile
index 348874c6ba..ca373cf991 100644
--- a/src/systemd-sleep/Makefile
+++ b/src/systemd-sleep/Makefile
@@ -30,4 +30,6 @@ systemd_sleep_SOURCES = \
 systemd_sleep_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesync/.gitignore b/src/systemd-timesyncd/.gitignore
index 35f4d76f79..35f4d76f79 100644
--- a/src/systemd-timesync/.gitignore
+++ b/src/systemd-timesyncd/.gitignore
diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesyncd/Makefile
index a329865019..5d7e131a1f 100644
--- a/src/systemd-timesync/Makefile
+++ b/src/systemd-timesyncd/Makefile
@@ -61,4 +61,7 @@ EXTRA_DIST += \
 	units/systemd-timesyncd.service.in \
 	src/timesync/timesyncd.conf.in
 
+systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-network
+systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesync/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c
index 20c64a3354..20c64a3354 100644
--- a/src/systemd-timesync/timesyncd-conf.c
+++ b/src/systemd-timesyncd/timesyncd-conf.c
diff --git a/src/systemd-timesync/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h
index cba0724b1b..cba0724b1b 100644
--- a/src/systemd-timesync/timesyncd-conf.h
+++ b/src/systemd-timesyncd/timesyncd-conf.h
diff --git a/src/systemd-timesync/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf
index 29a2cfeef6..29a2cfeef6 100644
--- a/src/systemd-timesync/timesyncd-gperf.gperf
+++ b/src/systemd-timesyncd/timesyncd-gperf.gperf
diff --git a/src/systemd-timesync/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c
index 6a4b52af69..6a4b52af69 100644
--- a/src/systemd-timesync/timesyncd-manager.c
+++ b/src/systemd-timesyncd/timesyncd-manager.c
diff --git a/src/systemd-timesync/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h
index fd25647725..fd25647725 100644
--- a/src/systemd-timesync/timesyncd-manager.h
+++ b/src/systemd-timesyncd/timesyncd-manager.h
diff --git a/src/systemd-timesync/timesyncd-server.c b/src/systemd-timesyncd/timesyncd-server.c
index 6bda86fe6e..6bda86fe6e 100644
--- a/src/systemd-timesync/timesyncd-server.c
+++ b/src/systemd-timesyncd/timesyncd-server.c
diff --git a/src/systemd-timesync/timesyncd-server.h b/src/systemd-timesyncd/timesyncd-server.h
index 8a19e41d67..8a19e41d67 100644
--- a/src/systemd-timesync/timesyncd-server.h
+++ b/src/systemd-timesyncd/timesyncd-server.h
diff --git a/src/systemd-timesync/timesyncd.c b/src/systemd-timesyncd/timesyncd.c
index 9e538a82f2..9e538a82f2 100644
--- a/src/systemd-timesync/timesyncd.c
+++ b/src/systemd-timesyncd/timesyncd.c
diff --git a/src/systemd-timesync/timesyncd.conf.in b/src/systemd-timesyncd/timesyncd.conf.in
index b6a2ada273..b6a2ada273 100644
--- a/src/systemd-timesync/timesyncd.conf.in
+++ b/src/systemd-timesyncd/timesyncd.conf.in