From 3995a53b0db59471e4ccc3d92276a0d8831d3865 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 12 Jun 2016 17:43:54 -0400
Subject: more

---
 Makefile.am | 20 ++++++++++----------
 move.sh     | 13 +++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1f001d70b4..01f90459ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2453,7 +2453,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
-#@src/modules-load/Makefile ----------------------------------------------------
+#@src/systemd-modules-load/Makefile --------------------------------------------
 if HAVE_KMOD
 systemd_modules_load_SOURCES = \
 	src/modules-load/modules-load.c
@@ -2615,7 +2615,7 @@ endif # ENABLE_FIRSTBOOT
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
-#@src/machine-id-setup/Makefile ------------------------------------------------
+#@src/systemd-machine-id-setup/Makefile ----------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
 	src/core/machine-id-setup.c \
@@ -2627,14 +2627,14 @@ systemd_machine_id_setup_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	systemd-machine-id-commit.service
 
-#@src/sysctl/Makefile ----------------------------------------------------------
+#@src/systemd-sysctl/Makefile --------------------------------------------------
 systemd_sysctl_SOURCES = \
 	src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
 	libshared.la
 
-#@src/sleep/Makefile -----------------------------------------------------------
+#@src/systemd-sleep/Makefile ---------------------------------------------------
 systemd_sleep_SOURCES = \
 	src/sleep/sleep.c
 
@@ -4504,7 +4504,7 @@ endif # HAVE_MICROHTTPD
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
-#@src/socket-proxy/Makefile ----------------------------------------------------
+#@src/systemd-socket-proxyd/Makefile -------------------------------------------
 
 systemd_socket_proxyd_SOURCES = \
 	src/socket-proxy/socket-proxyd.c
@@ -4759,7 +4759,7 @@ SYSINIT_TARGET_WANTS += \
 
 endif # HAVE_LIBCRYPTSETUP
 
-#@src/hostname/Makefile --------------------------------------------------------
+#@src/grp-hostname/Makefile ----------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
@@ -4820,7 +4820,7 @@ dist_systemunit_DATA_busnames += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
-#@src/locale/Makefile ----------------------------------------------------------
+#@src/grp-locale/Makefile ------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 	src/locale/localed.c
@@ -5127,7 +5127,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
-#@src/import/Makefile ----------------------------------------------------------
+#@src/grp-import/Makefile ------------------------------------------------------
 if ENABLE_IMPORTD
 
 if HAVE_LIBCURL
@@ -5505,7 +5505,7 @@ EXTRA_DIST += \
 	units/systemd-resolved.service.m4.in \
 	src/resolve/resolved.conf.in
 
-#@src/network/Makefile ---------------------------------------------------------
+#@src/grp-network/Makefile -----------------------------------------------------
 if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
 	systemd-networkd
@@ -5693,7 +5693,7 @@ EXTRA_DIST += \
 	units/systemd-networkd-wait-online.service.in \
 	test/networkd-test.py
 
-#@src/login/Makefile -----------------------------------------------------------
+#@src/grp-login/Makefile -------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
 	src/login/logind.c \
diff --git a/move.sh b/move.sh
index 3c9d359fbf..1340dc4c6a 100755
--- a/move.sh
+++ b/move.sh
@@ -48,6 +48,8 @@ move_files() (
 		fsck
 		hibernate-resume
 		hwdb
+		machine-id-setup
+		modules-load
 		notify
 		nspawn
 		path
@@ -57,7 +59,10 @@ move_files() (
 		reply-password
 		rfkill
 		run
+		sleep
 		stdio-bridge
+		socket-proxy
+		sysctl
 		timesync
 		tmpfiles
 		tty-ask-password-agent
@@ -70,6 +75,8 @@ move_files() (
 		mv -T src/{,systemd-}$d
 	done
 
+	mv -T src/systemd-socket-proxy{,d}
+
 	mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install
 	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
 	mv -T {man,src/kernel-install}/kernel-install.xml
@@ -192,6 +199,12 @@ move_files() (
 		mkdir src/grp-journal-remote/systemd-journal-$suffix
 		mv src/grp-journal-remote/journal-$suffix* src/grp-journal-remote/systemd-journal-$suffix/
 	done
+
+	mv -T src/{,grp-}hostname
+	mv -T src/{,grp-}import
+	mv -T src/{,grp-}locale
+	mv -T src/{,grp-}login
+	mv -T src/{,grp-}network
 )
 
 breakup_makefile() (
-- 
cgit v1.2.3-54-g00ecf