32 files changed, 34 insertions, 15 deletions
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/src/grp-initprogs/systemd-binfmt/proc-sys-fs-binfmt_misc.automount
index 6be38937b1..6be38937b1 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/src/grp-initprogs/systemd-binfmt/proc-sys-fs-binfmt_misc.automount
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/src/grp-initprogs/systemd-binfmt/proc-sys-fs-binfmt_misc.mount
index 8c7c386318..8c7c386318 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/src/grp-initprogs/systemd-binfmt/proc-sys-fs-binfmt_misc.mount
diff --git a/units/kmod-static-nodes.service.in b/src/grp-initprogs/systemd-modules-load/kmod-static-nodes.service.in
index a9c8df1184..a9c8df1184 100644
--- a/units/kmod-static-nodes.service.in
+++ b/src/grp-initprogs/systemd-modules-load/kmod-static-nodes.service.in
diff --git a/units/quotaon.service.in b/src/grp-initprogs/systemd-quotacheck/quotaon.service.in
index 7d59a40195..7d59a40195 100644
--- a/units/quotaon.service.in
+++ b/src/grp-initprogs/systemd-quotacheck/quotaon.service.in
diff --git a/units/systemd-journal-catalog-update.service.in b/src/grp-journal/journalctl/systemd-journal-catalog-update.service.in
index 6370dd478f..6370dd478f 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/src/grp-journal/journalctl/systemd-journal-catalog-update.service.in
diff --git a/units/systemd-journal-flush.service.in b/src/grp-journal/journalctl/systemd-journal-flush.service.in
index a0a2e3fdb4..a0a2e3fdb4 100644
--- a/units/systemd-journal-flush.service.in
+++ b/src/grp-journal/journalctl/systemd-journal-flush.service.in
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.service.in b/src/grp-journal/journalctl/systemd-journal-gatewayd.service.in
index f4f845841d..f4f845841d 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.service.in
+++ b/src/grp-journal/journalctl/systemd-journal-gatewayd.service.in
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.socket b/src/grp-journal/journalctl/systemd-journal-gatewayd.socket
index 79d9b04210..79d9b04210 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.socket
+++ b/src/grp-journal/journalctl/systemd-journal-gatewayd.socket
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.service.in b/src/grp-journal/journalctl/systemd-journal-remote.service.in
index fdf3da4b64..fdf3da4b64 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.service.in
+++ b/src/grp-journal/journalctl/systemd-journal-remote.service.in
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.socket b/src/grp-journal/journalctl/systemd-journal-remote.socket
index 076dcae8a3..076dcae8a3 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.socket
+++ b/src/grp-journal/journalctl/systemd-journal-remote.socket
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.service.in b/src/grp-journal/journalctl/systemd-journal-upload.service.in
index 1f488ff425..1f488ff425 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.service.in
+++ b/src/grp-journal/journalctl/systemd-journal-upload.service.in
diff --git a/units/systemd-journald-audit.socket b/src/grp-journal/systemd-journald/systemd-journald-audit.socket
index 541f2cf38d..541f2cf38d 100644
--- a/units/systemd-journald-audit.socket
+++ b/src/grp-journal/systemd-journald/systemd-journald-audit.socket
diff --git a/units/systemd-journald-dev-log.socket b/src/grp-journal/systemd-journald/systemd-journald-dev-log.socket
index ffd44bb507..ffd44bb507 100644
--- a/units/systemd-journald-dev-log.socket
+++ b/src/grp-journal/systemd-journald/systemd-journald-dev-log.socket
diff --git a/src/systemd-shutdown/halt.target b/src/grp-system/systemd-shutdown/halt.target
index a21d984b26..a21d984b26 100644
--- a/src/systemd-shutdown/halt.target
+++ b/src/grp-system/systemd-shutdown/halt.target
diff --git a/src/systemd-shutdown/kexec.target b/src/grp-system/systemd-shutdown/kexec.target
index 90795d0c5a..90795d0c5a 100644
--- a/src/systemd-shutdown/kexec.target
+++ b/src/grp-system/systemd-shutdown/kexec.target
diff --git a/src/systemd-shutdown/poweroff.target b/src/grp-system/systemd-shutdown/poweroff.target
index dd92d816ca..dd92d816ca 100644
--- a/src/systemd-shutdown/poweroff.target
+++ b/src/grp-system/systemd-shutdown/poweroff.target
diff --git a/src/systemd-shutdown/reboot.target b/src/grp-system/systemd-shutdown/reboot.target
index 668b98d9e4..668b98d9e4 100644
--- a/src/systemd-shutdown/reboot.target
+++ b/src/grp-system/systemd-shutdown/reboot.target
diff --git a/src/systemd-shutdown/shutdown.c b/src/grp-system/systemd-shutdown/shutdown.c
index e14755d84e..e14755d84e 100644
--- a/src/systemd-shutdown/shutdown.c
+++ b/src/grp-system/systemd-shutdown/shutdown.c
diff --git a/src/systemd-shutdown/shutdown.target b/src/grp-system/systemd-shutdown/shutdown.target
index 73e302b8b2..73e302b8b2 100644
--- a/src/systemd-shutdown/shutdown.target
+++ b/src/grp-system/systemd-shutdown/shutdown.target
diff --git a/src/systemd-shutdown/systemd-halt.service.in b/src/grp-system/systemd-shutdown/systemd-halt.service.in
index d55d622c1c..d55d622c1c 100644
--- a/src/systemd-shutdown/systemd-halt.service.in
+++ b/src/grp-system/systemd-shutdown/systemd-halt.service.in
diff --git a/src/systemd-shutdown/systemd-kexec.service.in b/src/grp-system/systemd-shutdown/systemd-kexec.service.in
index 61303f917f..61303f917f 100644
--- a/src/systemd-shutdown/systemd-kexec.service.in
+++ b/src/grp-system/systemd-shutdown/systemd-kexec.service.in
diff --git a/src/systemd-shutdown/systemd-poweroff.service.in b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in
index 3630719733..3630719733 100644
--- a/src/systemd-shutdown/systemd-poweroff.service.in
+++ b/src/grp-system/systemd-shutdown/systemd-poweroff.service.in
diff --git a/src/systemd-shutdown/systemd-reboot.service.in b/src/grp-system/systemd-shutdown/systemd-reboot.service.in
index d99bd3e701..d99bd3e701 100644
--- a/src/systemd-shutdown/systemd-reboot.service.in
+++ b/src/grp-system/systemd-shutdown/systemd-reboot.service.in
diff --git a/src/systemd-shutdown/systemd-shutdown.xml b/src/grp-system/systemd-shutdown/systemd-shutdown.xml
index c94e2a1820..c94e2a1820 100644
--- a/src/systemd-shutdown/systemd-shutdown.xml
+++ b/src/grp-system/systemd-shutdown/systemd-shutdown.xml
diff --git a/src/systemd-shutdown/umount.c b/src/grp-system/systemd-shutdown/umount.c
index c21a2be54e..c21a2be54e 100644
--- a/src/systemd-shutdown/umount.c
+++ b/src/grp-system/systemd-shutdown/umount.c
diff --git a/src/systemd-shutdown/umount.h b/src/grp-system/systemd-shutdown/umount.h
index 4e2215a47d..4e2215a47d 100644
--- a/src/systemd-shutdown/umount.h
+++ b/src/grp-system/systemd-shutdown/umount.h
diff --git a/man/libsystemd-pkgconfig.xml b/src/libsystemd/libsystemd-pkgconfig.xml
index 272da64cd7..272da64cd7 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/src/libsystemd/libsystemd-pkgconfig.xml
diff --git a/units/cryptsetup-pre.target b/src/systemd-cryptsetup/cryptsetup-pre.target
index 65353419fc..65353419fc 100644
--- a/units/cryptsetup-pre.target
+++ b/src/systemd-cryptsetup/cryptsetup-pre.target
diff --git a/man/crypttab.xml b/src/systemd-cryptsetup/crypttab.xml
index 1de834a045..1de834a045 100644
--- a/man/crypttab.xml
+++ b/src/systemd-cryptsetup/crypttab.xml
diff --git a/man/systemd-cryptsetup-generator.xml b/src/systemd-cryptsetup/systemd-cryptsetup-generator.xml
index f036ab9744..f036ab9744 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/src/systemd-cryptsetup/systemd-cryptsetup-generator.xml
diff --git a/man/systemd-machine-id-commit.service.xml b/src/systemd-machine-id-setup/systemd-machine-id-commit.service.xml
index 39da1922cc..39da1922cc 100644
--- a/man/systemd-machine-id-commit.service.xml
+++ b/src/systemd-machine-id-setup/systemd-machine-id-commit.service.xml
diff --git a/tools/move.sh b/tools/move.sh
index 00933033a9..b27c3abdd6 100755
--- a/tools/move.sh
+++ b/tools/move.sh
@@ -351,6 +351,7 @@ move_files() (
 
 	# less obvious manpage groups
 	mv -t src/libsystemd \
+	   man/libsystemd* \
 	   man/sd*
 	mv -t src/libudev \
 	   man/udev_*
@@ -378,26 +379,43 @@ move_files() (
 	   man/udev.conf.xml
 	mv -t src/grp-udev.d \
 	   man/udev.xml
+	mv -t src/systemd-cryptsetup \
+	   man/*crypt*
+	mv -t src/systemd-machine-id-setup \
+	   man/systemd-machine-id*
 	mv -T man/glib-event-glue.c src/libsystemd/sd_event_get_fd-glib-example.c
 	mv -T man/systemd-halt.service.xml src/systemd-shutdown/systemd-shutdown.xml
 
 	# less obvious unit groups
+	# suffix these with '*' in case they gain or lose the .in suffix.
 	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
+	   units/hibernate.target* \
+	   units/hybrid-sleep.target* \
+	   units/suspend.target* \
+	   units/systemd-hibernate.service* \
+	   units/systemd-hybrid-sleep.service* \
+	   units/systemd-suspend.service*
 	mv -t src/systemd-shutdown \
-	   units/halt.target \
-	   units/kexec.target \
-	   units/poweroff.target \
-	   units/reboot.target \
-	   units/systemd-halt.service.in \
-	   units/systemd-kexec.service.in \
-	   units/systemd-poweroff.service.in \
-	   units/systemd-reboot.service.in
+	   units/halt.target* \
+	   units/kexec.target* \
+	   units/poweroff.target* \
+	   units/reboot.target* \
+	   units/systemd-halt.service* \
+	   units/systemd-kexec.service* \
+	   units/systemd-poweroff.service* \
+	   units/systemd-reboot.service*
+	mv -t src/systemd-binfmt \
+	   units/*binfmt*
+	mv -t src/systemd-modules-load \
+	   units/kmod*
+	mv -t src/systemd-quotacheck \
+	   units/quota*
+	mv -t src/systemd-journald \
+	   units/*journald*
+	mv -t src/journalctl \
+	   units/*journal*
+	mv -t src/systemd-cryptsetup \
+	   units/cryptsetup*
 
 	# muck
 	mv -T {test,src/systemd-boot}/test-efi-create-disk.sh
@@ -547,7 +565,8 @@ move_files() (
 	grp src/grp-system \
 	    src/libcore \
 	    src/systemctl \
-	    src/systemd
+	    src/systemd \
+	    src/systemd-shutdown
 	grp src/grp-system/grp-utils \
 	    src/systemd-analyze \
 	    src/systemd-delta \