79 files changed, 36 insertions, 3 deletions
diff --git a/src/manpages/.gitignore b/man/.gitignore
index d928e5a83f..d928e5a83f 100644
--- a/src/manpages/.gitignore
+++ b/man/.gitignore
diff --git a/src/manpages/binfmt.d.xml b/man/binfmt.d.xml
index 5b63cfb4c3..5b63cfb4c3 100644
--- a/src/manpages/binfmt.d.xml
+++ b/man/binfmt.d.xml
diff --git a/src/manpages/bootup.xml b/man/bootup.xml
index 986996398c..986996398c 100644
--- a/src/manpages/bootup.xml
+++ b/man/bootup.xml
diff --git a/src/manpages/coredump.conf.xml b/man/coredump.conf.xml
index 4f95680a3a..4f95680a3a 100644
--- a/src/manpages/coredump.conf.xml
+++ b/man/coredump.conf.xml
diff --git a/src/manpages/crypttab.xml b/man/crypttab.xml
index 1de834a045..1de834a045 100644
--- a/src/manpages/crypttab.xml
+++ b/man/crypttab.xml
diff --git a/src/manpages/custom-html.xsl b/man/custom-html.xsl
index e89d73e7f1..e89d73e7f1 100644
--- a/src/manpages/custom-html.xsl
+++ b/man/custom-html.xsl
diff --git a/src/manpages/custom-man.xsl b/man/custom-man.xsl
index e1b8d3618a..e1b8d3618a 100644
--- a/src/manpages/custom-man.xsl
+++ b/man/custom-man.xsl
diff --git a/src/manpages/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml
index 4bdc167f79..4bdc167f79 100644
--- a/src/manpages/dnssec-trust-anchors.d.xml
+++ b/man/dnssec-trust-anchors.d.xml
diff --git a/src/manpages/glib-event-glue.c b/man/glib-event-glue.c
index 8f3168d0ea..8f3168d0ea 100644
--- a/src/manpages/glib-event-glue.c
+++ b/man/glib-event-glue.c
diff --git a/src/manpages/halt.xml b/man/halt.xml
index e3fa60a915..e3fa60a915 100644
--- a/src/manpages/halt.xml
+++ b/man/halt.xml
diff --git a/src/manpages/hwdb.xml b/man/hwdb.xml
index 2b1e60fb22..2b1e60fb22 100644
--- a/src/manpages/hwdb.xml
+++ b/man/hwdb.xml
diff --git a/src/manpages/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 2d345963d9..2d345963d9 100644
--- a/src/manpages/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
diff --git a/src/manpages/journald.conf.xml b/man/journald.conf.xml
index 3964cd6bc5..3964cd6bc5 100644
--- a/src/manpages/journald.conf.xml
+++ b/man/journald.conf.xml
diff --git a/src/manpages/kernel-command-line.xml b/man/kernel-command-line.xml
index 9c04849f66..9c04849f66 100644
--- a/src/manpages/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
diff --git a/src/manpages/less-variables.xml b/man/less-variables.xml
index 0fb4d7fbcf..0fb4d7fbcf 100644
--- a/src/manpages/less-variables.xml
+++ b/man/less-variables.xml
diff --git a/src/manpages/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 272da64cd7..272da64cd7 100644
--- a/src/manpages/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
diff --git a/src/manpages/locale.conf.xml b/man/locale.conf.xml
index 2fe731113a..2fe731113a 100644
--- a/src/manpages/locale.conf.xml
+++ b/man/locale.conf.xml
diff --git a/src/manpages/logind.conf.xml b/man/logind.conf.xml
index fe92277a1f..fe92277a1f 100644
--- a/src/manpages/logind.conf.xml
+++ b/man/logind.conf.xml
diff --git a/src/manpages/modules-load.d.xml b/man/modules-load.d.xml
index 4b722aa128..4b722aa128 100644
--- a/src/manpages/modules-load.d.xml
+++ b/man/modules-load.d.xml
diff --git a/src/manpages/networkd.conf.xml b/man/networkd.conf.xml
index 4bfc4f773a..4bfc4f773a 100644
--- a/src/manpages/networkd.conf.xml
+++ b/man/networkd.conf.xml
diff --git a/src/manpages/resolved.conf.xml b/man/resolved.conf.xml
index 920ce9e89b..920ce9e89b 100644
--- a/src/manpages/resolved.conf.xml
+++ b/man/resolved.conf.xml
diff --git a/src/manpages/runlevel.xml b/man/runlevel.xml
index ca29c7c22c..ca29c7c22c 100644
--- a/src/manpages/runlevel.xml
+++ b/man/runlevel.xml
diff --git a/src/manpages/shutdown.xml b/man/shutdown.xml
index a8af387c67..a8af387c67 100644
--- a/src/manpages/shutdown.xml
+++ b/man/shutdown.xml
diff --git a/src/manpages/standard-conf.xml b/man/standard-conf.xml
index 6edbb7ff83..6edbb7ff83 100644
--- a/src/manpages/standard-conf.xml
+++ b/man/standard-conf.xml
diff --git a/src/manpages/standard-options.xml b/man/standard-options.xml
index f214463392..f214463392 100644
--- a/src/manpages/standard-options.xml
+++ b/man/standard-options.xml
diff --git a/src/manpages/sysctl.d.xml b/man/sysctl.d.xml
index ccf6c8e39f..ccf6c8e39f 100644
--- a/src/manpages/sysctl.d.xml
+++ b/man/sysctl.d.xml
diff --git a/src/manpages/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 479e5f2e5b..479e5f2e5b 100644
--- a/src/manpages/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
diff --git a/src/manpages/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index f036ab9744..f036ab9744 100644
--- a/src/manpages/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
diff --git a/src/manpages/systemd-halt.service.xml b/man/systemd-halt.service.xml
index c94e2a1820..c94e2a1820 100644
--- a/src/manpages/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
diff --git a/src/manpages/systemd-machine-id-commit.service.xml b/man/systemd-machine-id-commit.service.xml
index 39da1922cc..39da1922cc 100644
--- a/src/manpages/systemd-machine-id-commit.service.xml
+++ b/man/systemd-machine-id-commit.service.xml
diff --git a/src/manpages/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index a8beb86f4d..a8beb86f4d 100644
--- a/src/manpages/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
diff --git a/src/manpages/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 8833e73c72..8833e73c72 100644
--- a/src/manpages/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
diff --git a/src/manpages/sysusers.d.xml b/man/sysusers.d.xml
index 18ee3800d6..18ee3800d6 100644
--- a/src/manpages/sysusers.d.xml
+++ b/man/sysusers.d.xml
diff --git a/src/manpages/telinit.xml b/man/telinit.xml
index 02d31fbd46..02d31fbd46 100644
--- a/src/manpages/telinit.xml
+++ b/man/telinit.xml
diff --git a/src/manpages/timesyncd.conf.xml b/man/timesyncd.conf.xml
index 8c86fd0074..8c86fd0074 100644
--- a/src/manpages/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
diff --git a/src/manpages/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 957475d2bd..957475d2bd 100644
--- a/src/manpages/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
diff --git a/src/manpages/user-system-options.xml b/man/user-system-options.xml
index 8616c54249..8616c54249 100644
--- a/src/manpages/user-system-options.xml
+++ b/man/user-system-options.xml
diff --git a/src/manpages/vconsole.conf.xml b/man/vconsole.conf.xml
index 27196d44e9..27196d44e9 100644
--- a/src/manpages/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
diff --git a/test/test-efi-create-disk.sh b/src/grp-boot/systemd-boot/test-efi-create-disk.sh
index 56dd09abd7..56dd09abd7 100755
--- a/test/test-efi-create-disk.sh
+++ b/src/grp-boot/systemd-boot/test-efi-create-disk.sh
diff --git a/units/hibernate.target b/src/grp-initprogs/grp-sleep/systemd-sleep/hibernate.target
index 143eb59230..143eb59230 100644
--- a/units/hibernate.target
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/hibernate.target
diff --git a/units/hybrid-sleep.target b/src/grp-initprogs/grp-sleep/systemd-sleep/hybrid-sleep.target
index d2d3409225..d2d3409225 100644
--- a/units/hybrid-sleep.target
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/hybrid-sleep.target
diff --git a/units/suspend.target b/src/grp-initprogs/grp-sleep/systemd-sleep/suspend.target
index f50cb2264f..f50cb2264f 100644
--- a/units/suspend.target
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/suspend.target
diff --git a/units/systemd-hibernate.service.in b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-hibernate.service.in
index 29d9b696a8..29d9b696a8 100644
--- a/units/systemd-hibernate.service.in
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-hibernate.service.in
diff --git a/units/systemd-hybrid-sleep.service.in b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-hybrid-sleep.service.in
index 914b686c36..914b686c36 100644
--- a/units/systemd-hybrid-sleep.service.in
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-hybrid-sleep.service.in
diff --git a/units/systemd-suspend.service.in b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-suspend.service.in
index 3a702d2e22..3a702d2e22 100644
--- a/units/systemd-suspend.service.in
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/systemd-suspend.service.in
diff --git a/units/systemd-tmpfiles-clean.service.in b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-clean.service.in
index 133c8c94c4..133c8c94c4 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-clean.service.in
diff --git a/units/systemd-tmpfiles-clean.timer b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-clean.timer
index 9975dcfaca..9975dcfaca 100644
--- a/units/systemd-tmpfiles-clean.timer
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-clean.timer
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-setup-dev.service.in
index 0123a030e4..0123a030e4 100644
--- a/units/systemd-tmpfiles-setup-dev.service.in
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-setup-dev.service.in
diff --git a/units/systemd-tmpfiles-setup.service.in b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-setup.service.in
index e895cda0e6..e895cda0e6 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles-setup.service.in
diff --git a/tmpfiles.d/var.conf b/src/grp-initprogs/systemd-tmpfiles/var.tmpfiles
index ae7952e77a..ae7952e77a 100644
--- a/tmpfiles.d/var.conf
+++ b/src/grp-initprogs/systemd-tmpfiles/var.tmpfiles
diff --git a/tmpfiles.d/x11.conf b/src/grp-initprogs/systemd-tmpfiles/x11.tmpfiles
index 4c96a54a13..4c96a54a13 100644
--- a/tmpfiles.d/x11.conf
+++ b/src/grp-initprogs/systemd-tmpfiles/x11.tmpfiles
diff --git a/src/libsystemd/include/systemd/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
index f7bd5c4b7a..f7bd5c4b7a 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
diff --git a/src/libsystemd/include/systemd/sd-dhcp-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
index 2f565ca825..2f565ca825 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
diff --git a/src/libsystemd/include/systemd/sd-dhcp-server.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
index bbb2bb203c..bbb2bb203c 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-server.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
index 6bcd9862c9..6bcd9862c9 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
index 184fbb8e0d..184fbb8e0d 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
diff --git a/src/libsystemd/include/systemd/sd-ipv4acd.h b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
index 93db7a4a6c..93db7a4a6c 100644
--- a/src/libsystemd/include/systemd/sd-ipv4acd.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
diff --git a/src/libsystemd/include/systemd/sd-ipv4ll.h b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
index 9167623167..9167623167 100644
--- a/src/libsystemd/include/systemd/sd-ipv4ll.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
diff --git a/src/libsystemd/include/systemd/sd-lldp.h b/src/libsystemd-network/include/systemd-network/sd-lldp.h
index 391e7c2a2e..391e7c2a2e 100644
--- a/src/libsystemd/include/systemd/sd-lldp.h
+++ b/src/libsystemd-network/include/systemd-network/sd-lldp.h
diff --git a/src/libsystemd/include/systemd/sd-ndisc.h b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
index c77a435d17..c77a435d17 100644
--- a/src/libsystemd/include/systemd/sd-ndisc.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
diff --git a/src/libsystemd/include/systemd/sd-device.h b/src/libsystemd/src/sd-device/sd-device.h
index c1d07561d7..c1d07561d7 100644
--- a/src/libsystemd/include/systemd/sd-device.h
+++ b/src/libsystemd/src/sd-device/sd-device.h
diff --git a/src/libsystemd/include/systemd/sd-hwdb.h b/src/libsystemd/src/sd-hwdb/sd-hwdb.h
index 7105920492..7105920492 100644
--- a/src/libsystemd/include/systemd/sd-hwdb.h
+++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.h
diff --git a/src/libsystemd/include/systemd/sd-netlink.h b/src/libsystemd/src/sd-netlink/sd-netlink.h
index c4cefe4e30..c4cefe4e30 100644
--- a/src/libsystemd/include/systemd/sd-netlink.h
+++ b/src/libsystemd/src/sd-netlink/sd-netlink.h
diff --git a/src/libsystemd/include/systemd/sd-network.h b/src/libsystemd/src/sd-network/sd-network.h
index 0f13e2bae7..0f13e2bae7 100644
--- a/src/libsystemd/include/systemd/sd-network.h
+++ b/src/libsystemd/src/sd-network/sd-network.h
diff --git a/src/libsystemd/include/systemd/sd-resolve.h b/src/libsystemd/src/sd-resolve/sd-resolve.h
index fe3b910671..fe3b910671 100644
--- a/src/libsystemd/include/systemd/sd-resolve.h
+++ b/src/libsystemd/src/sd-resolve/sd-resolve.h
diff --git a/src/libudev/libudev.h b/src/libudev/include/libudev.h
index 3f6d0ed16c..3f6d0ed16c 100644
--- a/src/libudev/libudev.h
+++ b/src/libudev/include/libudev.h
diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h
index f76da09407..f76da09407 100644
--- a/src/libudev/libudev-device-internal.h
+++ b/src/libudev/src/libudev-device-internal.h
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/src/libudev-device-private.c
index 2aae0726c1..2aae0726c1 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/src/libudev-device-private.c
diff --git a/src/libudev/libudev-device.c b/src/libudev/src/libudev-device.c
index 6536f4cfbb..6536f4cfbb 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index 9910cea957..9910cea957 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index 8c4b488086..8c4b488086 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
diff --git a/src/libudev/libudev-list.c b/src/libudev/src/libudev-list.c
index da496ed456..da496ed456 100644
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/src/libudev-list.c
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/src/libudev-monitor.c
index f870eba9eb..f870eba9eb 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/src/libudev-monitor.c
diff --git a/src/libudev/libudev-private.h b/src/libudev/src/libudev-private.h
index 52c5075110..52c5075110 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/src/libudev-private.h
diff --git a/src/libudev/libudev-queue.c b/src/libudev/src/libudev-queue.c
index e3dffa6925..e3dffa6925 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/src/libudev-queue.c
diff --git a/src/libudev/libudev-util.c b/src/libudev/src/libudev-util.c
index 574cfeac85..574cfeac85 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/src/libudev-util.c
diff --git a/src/libudev/libudev.c b/src/libudev/src/libudev.c
index 63fb05547d..63fb05547d 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/src/libudev.c
diff --git a/src/libudev/udev.h b/src/libudev/src/udev.h
index 00de88972a..00de88972a 100644
--- a/src/libudev/udev.h
+++ b/src/libudev/src/udev.h
diff --git a/tools/move.sh b/tools/move.sh
index 8a86ede3ee..f763258b66 100755
--- a/tools/move.sh
+++ b/tools/move.sh
@@ -337,10 +337,44 @@ move_files() (
 	mv -t src/systemd-udevd \
 	   src/udev/udevd*
 
+	# muck
+	mv -T {test,src/systemd-boot}/test-efi-create-disk.sh
+	mv -t src/libsystemd man/sd*
+	mv -t src/libudev man/udev_*
+	mkdir src/manpages
+	mv -t src/manpages \
+	   man/daemon.xml \
+	   man/file-hierarchy.xml \
+	   man/hostname.xml \
+	   man/localtime.xml \
+	   man/machine-id.xml \
+	   man/machine-info.xml \
+	   man/os-release.xml
+	mv -t src/systemd-sleep \
+	   units/hibernate.target \
+	   units/hybrid-sleep.target \
+	   units/suspend.target \
+	   units/systemd-hibernate.service.in \
+	   units/systemd-hybrid-sleep.service.in \
+	   units/systemd-suspend.service.in
+	mv -t src/systemd-tmpfiles units/systemd-tmpfiles*
+	mv -T tmpfiles.d/var.conf src/systemd-tmpfiles/var.tmpfiles
+	mv -T tmpfiles.d/x11.conf src/systemd-tmpfiles/x11.tmpfiles
+	mkdir src/libudev/src
+	mv -t src/libudev/src src/libudev/*.{c,h}
+	mkdir src/libudev/include
+	mv -T src/libudev/{src,include}/libudev.h
+	mv -t src/libsystemd-network/include/systemd-network \
+	   src/libsystemd/include/systemd/sd-dhcp* \
+	   src/libsystemd/include/systemd/sd-ipv4* \
+	   src/libsystemd/include/systemd/sd-lldp* \
+	   src/libsystemd/include/systemd/sd-ndisc*
+	for l in device hwdb netlink network resolve; do
+		mv -T src/libsystemd/include/systemd/sd-$l.h src/libsystemd/src/sd-$l/sd-$l.h
+	done
+
 	# auto-distribute the stuff
 	(
-		mv -t src/libsystemd man/sd*
-		mv -t src/libudev man/udev_*
 		cd man
 		for file in *; do
 			if [[ -d ../src/"${file%%.*}" ]]; then
@@ -350,7 +384,6 @@ move_files() (
 			fi
 		done
 	)
-	mv -T man src/manpages
 	(
 		cd units
 		for file in *; do