[systemd] Drop /usr prefix

149 files changed, 31 insertions, 41 deletions

diff --git a/core/includes/helper/fileutil.inc b/core/includes/helper/fileutil.inc
index 89d58f1a..b5a1e72d 100644
--- a/core/includes/helper/fileutil.inc
+++ b/core/includes/helper/fileutil.inc
@@ -25,7 +25,6 @@ tarcopy () {
 	[ ! -d "$TO" ] && { mkdir -p "$TO" || perror "could not create destination "$TO" for tar-copy."; } 
 	# TODO count files copied? would remove the need to do it everywhere :)
 	tar $IGNORE_ERROR -cpP $FROM | tar -xp -C "$TO" \
-		--transform 's,^/lib/udev/rules.d,/usr/lib/udev/rules.d,' \
 		2> /dev/null
 	local PS=(${PIPESTATUS[*]})
 	[ "x$IGNORE_ERROR" == "x" -a "x${PS[0]}" != "x0" ] && perror "packing-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[0]})"
diff --git a/core/modules/dbus/module.conf.ubuntu b/core/modules/dbus/module.conf.ubuntu
index 7c8092aa..eb538243 100644
--- a/core/modules/dbus/module.conf.ubuntu
+++ b/core/modules/dbus/module.conf.ubuntu
@@ -4,7 +4,3 @@ REQUIRED_CONTENT_PACKAGES="
 			dbus-x11
 			dbus-user-session
 "
-REQUIRED_DIRECTORIES="
-			/usr/share/dbus-1
-			/usr/lib/systemd/user
-"
diff --git a/core/modules/dunst/module.build b/core/modules/dunst/module.build
index d09204e5..f5961132 100644
--- a/core/modules/dunst/module.build
+++ b/core/modules/dunst/module.build
@@ -5,10 +5,7 @@ fetch_source() {
 }
 
 build() {
-	# copy udev rules to correct location
-	if [ -d "${TARGET_BUILD_DIR}/usr/lib/udev" ] && [ -d "${MODULE_BUILD_DIR}/lib/udev" ]; then
-		mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/"
-	fi
+	:
 }
 
 post_copy() {
diff --git a/core/modules/dunst/module.conf b/core/modules/dunst/module.conf
index 8aac23c5..41cd71ec 100644
--- a/core/modules/dunst/module.conf
+++ b/core/modules/dunst/module.conf
@@ -5,7 +5,7 @@ REQUIRED_BINARIES="
 "
 REQUIRED_DIRECTORIES="
 	/usr/share/dbus-1
-	/usr/lib/systemd/user
+	/lib/systemd/user
 "
 REQUIRED_FILES="
 "
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
index bf995a66..fa6029bc 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/vm_installer
@@ -20,7 +20,7 @@ case $(${PS} --pid 1 -o comm h) in
 		if [ -d /etc/systemd/system ]; then
 			SERVICEDIR=/etc/systemd/system/
 		else
-			SERVICEDIR=/usr/lib/systemd/system/
+			SERVICEDIR=/lib/systemd/system/
 		fi
 
 		if [ -L "${SERVICEDIR}/graphical.target.wants/${SERVICEMOUNT}" ] \
diff --git a/core/modules/systemd-distro/module.build b/core/modules/systemd-distro/module.build
index c7d9d09d..75bcf63f 100644
--- a/core/modules/systemd-distro/module.build
+++ b/core/modules/systemd-distro/module.build
@@ -20,6 +20,5 @@ post_copy() {
 	[ -d "${TARGET_BUILD_DIR}/usr/lib/systemd/system" ] \
 		&& ! [ -L "${TARGET_BUILD_DIR}/usr/lib/systemd/system" ] \
 		&& perror "/usr/lib/systemd/system must not exist in target build dir"
-	ln -nfs "../../../lib/systemd/system" "${TARGET_BUILD_DIR}/usr/lib/systemd/system"
 }
 
diff --git a/core/modules/systemd/data/usr/lib/sysctl.d/50-default.conf b/core/modules/systemd/data/lib/sysctl.d/50-default.conf
index 6ece04ce..6ece04ce 100644
--- a/core/modules/systemd/data/usr/lib/sysctl.d/50-default.conf
+++ b/core/modules/systemd/data/lib/sysctl.d/50-default.conf
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/autovt@.service b/core/modules/systemd/data/lib/systemd/system/autovt@.service
index fe40e8fd..fe40e8fd 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/autovt@.service
+++ b/core/modules/systemd/data/lib/systemd/system/autovt@.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/basic.target b/core/modules/systemd/data/lib/systemd/system/basic.target
index 6b9cfe4c..6b9cfe4c 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/basic.target
+++ b/core/modules/systemd/data/lib/systemd/system/basic.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/bluetooth.target b/core/modules/systemd/data/lib/systemd/system/bluetooth.target
index dd4ae14c..dd4ae14c 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/bluetooth.target
+++ b/core/modules/systemd/data/lib/systemd/system/bluetooth.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target b/core/modules/systemd/data/lib/systemd/system/busnames.target
index 5e866b40..5e866b40 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.login1.busname b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.login1.busname
index 9d1bd813..9d1bd813 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.login1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.login1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.machine1.busname b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.machine1.busname
index 068b1676..068b1676 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.machine1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.machine1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.network1.busname b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.network1.busname
index 13f4a8a7..13f4a8a7 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.network1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.network1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.resolve1.busname b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.resolve1.busname
index 1ede82df..1ede82df 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.resolve1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.resolve1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.systemd1.busname b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.systemd1.busname
index bf976b87..bf976b87 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/busnames.target.wants/org.freedesktop.systemd1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/busnames.target.wants/org.freedesktop.systemd1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/console-getty.service b/core/modules/systemd/data/lib/systemd/system/console-getty.service
index 5c9c01c7..5c9c01c7 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/console-getty.service
+++ b/core/modules/systemd/data/lib/systemd/system/console-getty.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/console-shell.service b/core/modules/systemd/data/lib/systemd/system/console-shell.service
index c1548299..c1548299 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/console-shell.service
+++ b/core/modules/systemd/data/lib/systemd/system/console-shell.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/ctrl-alt-del.target b/core/modules/systemd/data/lib/systemd/system/ctrl-alt-del.target
index f2fde431..f2fde431 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/ctrl-alt-del.target
+++ b/core/modules/systemd/data/lib/systemd/system/ctrl-alt-del.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/dbus-org.freedesktop.login1.service b/core/modules/systemd/data/lib/systemd/system/dbus-org.freedesktop.login1.service
index d87318cc..d87318cc 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/dbus-org.freedesktop.login1.service
+++ b/core/modules/systemd/data/lib/systemd/system/dbus-org.freedesktop.login1.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/dbus-org.freedesktop.machine1.service b/core/modules/systemd/data/lib/systemd/system/dbus-org.freedesktop.machine1.service
index 22692cce..22692cce 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/dbus-org.freedesktop.machine1.service
+++ b/core/modules/systemd/data/lib/systemd/system/dbus-org.freedesktop.machine1.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/debug-shell.service b/core/modules/systemd/data/lib/systemd/system/debug-shell.service
index 4220d7c2..4220d7c2 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
+++ b/core/modules/systemd/data/lib/systemd/system/debug-shell.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/default.target b/core/modules/systemd/data/lib/systemd/system/default.target
index a0aae86a..a0aae86a 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/default.target
+++ b/core/modules/systemd/data/lib/systemd/system/default.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/dev-hugepages.mount b/core/modules/systemd/data/lib/systemd/system/dev-hugepages.mount
index 86ad7ac2..86ad7ac2 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/dev-hugepages.mount
+++ b/core/modules/systemd/data/lib/systemd/system/dev-hugepages.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/dev-mqueue.mount b/core/modules/systemd/data/lib/systemd/system/dev-mqueue.mount
index b2adfeb8..b2adfeb8 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/dev-mqueue.mount
+++ b/core/modules/systemd/data/lib/systemd/system/dev-mqueue.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/emergency.service b/core/modules/systemd/data/lib/systemd/system/emergency.service
index 9f7db1db..4a45f2a7 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/emergency.service
+++ b/core/modules/systemd/data/lib/systemd/system/emergency.service
@@ -17,7 +17,7 @@ Before=shutdown.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=-/root
-ExecStart=-/usr/lib/systemd/systemd-sulogin-shell emergency
+ExecStart=-/lib/systemd/systemd-sulogin-shell emergency
 Type=idle
 StandardInput=tty-force
 StandardOutput=inherit
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/emergency.target b/core/modules/systemd/data/lib/systemd/system/emergency.target
index 0760d66f..0760d66f 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/emergency.target
+++ b/core/modules/systemd/data/lib/systemd/system/emergency.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/exit.target b/core/modules/systemd/data/lib/systemd/system/exit.target
index f5f953d1..f5f953d1 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/exit.target
+++ b/core/modules/systemd/data/lib/systemd/system/exit.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/final.target b/core/modules/systemd/data/lib/systemd/system/final.target
index 42819105..42819105 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/final.target
+++ b/core/modules/systemd/data/lib/systemd/system/final.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/getty.target b/core/modules/systemd/data/lib/systemd/system/getty.target
index c33d4465..c33d4465 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/getty.target
+++ b/core/modules/systemd/data/lib/systemd/system/getty.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/getty@.service b/core/modules/systemd/data/lib/systemd/system/getty@.service
index 5c1d1666..5c1d1666 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/getty@.service
+++ b/core/modules/systemd/data/lib/systemd/system/getty@.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/graphical.target b/core/modules/systemd/data/lib/systemd/system/graphical.target
index 87be97e1..87be97e1 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/graphical.target
+++ b/core/modules/systemd/data/lib/systemd/system/graphical.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/halt-local.service b/core/modules/systemd/data/lib/systemd/system/halt-local.service
index e6243eeb..e6243eeb 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/halt-local.service
+++ b/core/modules/systemd/data/lib/systemd/system/halt-local.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/halt.target b/core/modules/systemd/data/lib/systemd/system/halt.target
index a21d984b..a21d984b 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/halt.target
+++ b/core/modules/systemd/data/lib/systemd/system/halt.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/hibernate.target b/core/modules/systemd/data/lib/systemd/system/hibernate.target
index 143eb592..143eb592 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/hibernate.target
+++ b/core/modules/systemd/data/lib/systemd/system/hibernate.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/hybrid-sleep.target b/core/modules/systemd/data/lib/systemd/system/hybrid-sleep.target
index d2d34092..d2d34092 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/hybrid-sleep.target
+++ b/core/modules/systemd/data/lib/systemd/system/hybrid-sleep.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/kexec.target b/core/modules/systemd/data/lib/systemd/system/kexec.target
index 90795d0c..90795d0c 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/kexec.target
+++ b/core/modules/systemd/data/lib/systemd/system/kexec.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/kmod-static-nodes.service b/core/modules/systemd/data/lib/systemd/system/kmod-static-nodes.service
index 49c5d9bc..49c5d9bc 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/kmod-static-nodes.service
+++ b/core/modules/systemd/data/lib/systemd/system/kmod-static-nodes.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/machine.slice b/core/modules/systemd/data/lib/systemd/system/machine.slice
index 3d40dfd7..3d40dfd7 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/machine.slice
+++ b/core/modules/systemd/data/lib/systemd/system/machine.slice
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/machines.target b/core/modules/systemd/data/lib/systemd/system/machines.target
index 99618a19..99618a19 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/machines.target
+++ b/core/modules/systemd/data/lib/systemd/system/machines.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/machines.target.wants/var-lib-machines.mount b/core/modules/systemd/data/lib/systemd/system/machines.target.wants/var-lib-machines.mount
index 94338197..94338197 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/machines.target.wants/var-lib-machines.mount
+++ b/core/modules/systemd/data/lib/systemd/system/machines.target.wants/var-lib-machines.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target b/core/modules/systemd/data/lib/systemd/system/multi-user.target
index 998e0460..998e0460 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target
+++ b/core/modules/systemd/data/lib/systemd/system/multi-user.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/getty.target b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/getty.target
index bdba1fe4..bdba1fe4 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/getty.target
+++ b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/getty.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/systemd-logind.service b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/systemd-logind.service
index 270a900e..270a900e 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/systemd-logind.service
+++ b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/systemd-logind.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/systemd-user-sessions.service b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/systemd-user-sessions.service
index f878b529..f878b529 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/multi-user.target.wants/systemd-user-sessions.service
+++ b/core/modules/systemd/data/lib/systemd/system/multi-user.target.wants/systemd-user-sessions.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/network-online.target b/core/modules/systemd/data/lib/systemd/system/network-online.target
index 5130d8c5..5130d8c5 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/network-online.target
+++ b/core/modules/systemd/data/lib/systemd/system/network-online.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/network-pre.target b/core/modules/systemd/data/lib/systemd/system/network-pre.target
index 0d54a4cf..0d54a4cf 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/network-pre.target
+++ b/core/modules/systemd/data/lib/systemd/system/network-pre.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/network.target b/core/modules/systemd/data/lib/systemd/system/network.target
index 4186c088..4186c088 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/network.target
+++ b/core/modules/systemd/data/lib/systemd/system/network.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.login1.busname b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.login1.busname
index b169720f..b169720f 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.login1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.login1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.machine1.busname b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.machine1.busname
index a1f01547..a1f01547 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.machine1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.machine1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.network1.busname b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.network1.busname
index 3a0e1189..3a0e1189 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.network1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.network1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.resolve1.busname b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.resolve1.busname
index 28c8f970..28c8f970 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.resolve1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.resolve1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.systemd1.busname b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.systemd1.busname
index f9f41cba..f9f41cba 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/org.freedesktop.systemd1.busname
+++ b/core/modules/systemd/data/lib/systemd/system/org.freedesktop.systemd1.busname
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/paths.target b/core/modules/systemd/data/lib/systemd/system/paths.target
index 25c7fd03..25c7fd03 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/paths.target
+++ b/core/modules/systemd/data/lib/systemd/system/paths.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/poweroff.target b/core/modules/systemd/data/lib/systemd/system/poweroff.target
index dd92d816..dd92d816 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/poweroff.target
+++ b/core/modules/systemd/data/lib/systemd/system/poweroff.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/printer.target b/core/modules/systemd/data/lib/systemd/system/printer.target
index a6b86caa..a6b86caa 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/printer.target
+++ b/core/modules/systemd/data/lib/systemd/system/printer.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/proc-sys-fs-binfmt_misc.automount b/core/modules/systemd/data/lib/systemd/system/proc-sys-fs-binfmt_misc.automount
index 1067bcd8..1067bcd8 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/proc-sys-fs-binfmt_misc.automount
+++ b/core/modules/systemd/data/lib/systemd/system/proc-sys-fs-binfmt_misc.automount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/proc-sys-fs-binfmt_misc.mount b/core/modules/systemd/data/lib/systemd/system/proc-sys-fs-binfmt_misc.mount
index 27773cd4..27773cd4 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/proc-sys-fs-binfmt_misc.mount
+++ b/core/modules/systemd/data/lib/systemd/system/proc-sys-fs-binfmt_misc.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/rc-local.service b/core/modules/systemd/data/lib/systemd/system/rc-local.service
index cb9c1ba2..cb9c1ba2 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/rc-local.service
+++ b/core/modules/systemd/data/lib/systemd/system/rc-local.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/reboot.target b/core/modules/systemd/data/lib/systemd/system/reboot.target
index 668b98d9..668b98d9 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/reboot.target
+++ b/core/modules/systemd/data/lib/systemd/system/reboot.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs-pre.target b/core/modules/systemd/data/lib/systemd/system/remote-fs-pre.target
index 36a196cf..36a196cf 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs-pre.target
+++ b/core/modules/systemd/data/lib/systemd/system/remote-fs-pre.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs.target b/core/modules/systemd/data/lib/systemd/system/remote-fs.target
index 43ffa5c1..43ffa5c1 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs.target
+++ b/core/modules/systemd/data/lib/systemd/system/remote-fs.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs.target.wants/var-lib-machines.mount b/core/modules/systemd/data/lib/systemd/system/remote-fs.target.wants/var-lib-machines.mount
index 94338197..94338197 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/remote-fs.target.wants/var-lib-machines.mount
+++ b/core/modules/systemd/data/lib/systemd/system/remote-fs.target.wants/var-lib-machines.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/serial-getty@.service b/core/modules/systemd/data/lib/systemd/system/serial-getty@.service
index fb7b6e78..fb7b6e78 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/serial-getty@.service
+++ b/core/modules/systemd/data/lib/systemd/system/serial-getty@.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/shutdown.target b/core/modules/systemd/data/lib/systemd/system/shutdown.target
index 73e302b8..73e302b8 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/shutdown.target
+++ b/core/modules/systemd/data/lib/systemd/system/shutdown.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sigpwr.target b/core/modules/systemd/data/lib/systemd/system/sigpwr.target
index a52e7cff..a52e7cff 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sigpwr.target
+++ b/core/modules/systemd/data/lib/systemd/system/sigpwr.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sleep.target b/core/modules/systemd/data/lib/systemd/system/sleep.target
index 10c7c8d5..10c7c8d5 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sleep.target
+++ b/core/modules/systemd/data/lib/systemd/system/sleep.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/slices.target b/core/modules/systemd/data/lib/systemd/system/slices.target
index a29310c0..a29310c0 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/slices.target
+++ b/core/modules/systemd/data/lib/systemd/system/slices.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/smartcard.target b/core/modules/systemd/data/lib/systemd/system/smartcard.target
index 5fefe847..5fefe847 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/smartcard.target
+++ b/core/modules/systemd/data/lib/systemd/system/smartcard.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target b/core/modules/systemd/data/lib/systemd/system/sockets.target
index 26ab065d..26ab065d 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
index b7cca50f..b7cca50f 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-journald.socket
index 07ae46c4..07ae46c4 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-journald.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-shutdownd.socket b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-shutdownd.socket
index aa23208d..aa23208d 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-shutdownd.socket
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-shutdownd.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket
index 4bc0e548..4bc0e548 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket
index fab7990a..fab7990a 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket
+++ b/core/modules/systemd/data/lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sound.target b/core/modules/systemd/data/lib/systemd/system/sound.target
index 6699adec..6699adec 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sound.target
+++ b/core/modules/systemd/data/lib/systemd/system/sound.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/suspend.target b/core/modules/systemd/data/lib/systemd/system/suspend.target
index f50cb226..f50cb226 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/suspend.target
+++ b/core/modules/systemd/data/lib/systemd/system/suspend.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/swap.target b/core/modules/systemd/data/lib/systemd/system/swap.target
index 23a7d0dc..23a7d0dc 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/swap.target
+++ b/core/modules/systemd/data/lib/systemd/system/swap.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sys-fs-fuse-connections.mount b/core/modules/systemd/data/lib/systemd/system/sys-fs-fuse-connections.mount
index 492ceb16..492ceb16 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sys-fs-fuse-connections.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sys-fs-fuse-connections.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sys-kernel-config.mount b/core/modules/systemd/data/lib/systemd/system/sys-kernel-config.mount
index b585f325..b585f325 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sys-kernel-config.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sys-kernel-config.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target b/core/modules/systemd/data/lib/systemd/system/sysinit.target
index ec335033..ec335033 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount
index 6a26137b..6a26137b 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount
index f0b9fbf4..f0b9fbf4 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
index 0b7f61f0..0b7f61f0 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/sys-fs-fuse-connections.mount b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/sys-fs-fuse-connections.mount
index 85d20a2d..85d20a2d 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/sys-fs-fuse-connections.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/sys-fs-fuse-connections.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/sys-kernel-config.mount b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/sys-kernel-config.mount
index 831a9479..831a9479 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/sys-kernel-config.mount
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/sys-kernel-config.mount
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-binfmt.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-binfmt.service
index 07fbee12..07fbee12 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-binfmt.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-binfmt.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-journald.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-journald.service
index e9057f7d..e9057f7d 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-journald.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-journald.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service
index 79337696..79337696 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service
index fb5fbf0c..fb5fbf0c 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service
index 0a5032ac..0a5032ac 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service
index 12744a3e..12744a3e 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
index ff2ab9b3..ff2ab9b3 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-udevd.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-udevd.service
index e64bac22..e64bac22 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-udevd.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-udevd.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
index 78347c39..78347c39 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
+++ b/core/modules/systemd/data/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/syslog.socket b/core/modules/systemd/data/lib/systemd/system/syslog.socket
index d3987cb9..d3987cb9 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/syslog.socket
+++ b/core/modules/systemd/data/lib/systemd/system/syslog.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/system-update.target b/core/modules/systemd/data/lib/systemd/system/system-update.target
index 35428797..35428797 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/system-update.target
+++ b/core/modules/systemd/data/lib/systemd/system/system-update.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/system.slice b/core/modules/systemd/data/lib/systemd/system/system.slice
index 841f049b..841f049b 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/system.slice
+++ b/core/modules/systemd/data/lib/systemd/system/system.slice
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-binfmt.service b/core/modules/systemd/data/lib/systemd/system/systemd-binfmt.service
index b47d89af..b8bdaea2 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-binfmt.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-binfmt.service
@@ -23,5 +23,5 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-binfmt
+ExecStart=/lib/systemd/systemd-binfmt
 TimeoutSec=90s
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-exit.service b/core/modules/systemd/data/lib/systemd/system/systemd-exit.service
index 22bb6fbe..22bb6fbe 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-exit.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-exit.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-halt.service b/core/modules/systemd/data/lib/systemd/system/systemd-halt.service
index 4bd1afb8..4bd1afb8 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-halt.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-halt.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-hibernate.service b/core/modules/systemd/data/lib/systemd/system/systemd-hibernate.service
index 7f19e48f..71f0a4eb 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-hibernate.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-hibernate.service
@@ -14,4 +14,4 @@ After=sleep.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/systemd-sleep hibernate
+ExecStart=/lib/systemd/systemd-sleep hibernate
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-hybrid-sleep.service b/core/modules/systemd/data/lib/systemd/system/systemd-hybrid-sleep.service
index 7d627bfa..eb9f69ab 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-hybrid-sleep.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-hybrid-sleep.service
@@ -14,4 +14,4 @@ After=sleep.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/systemd-sleep hybrid-sleep
+ExecStart=/lib/systemd/systemd-sleep hybrid-sleep
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-initctl.service b/core/modules/systemd/data/lib/systemd/system/systemd-initctl.service
index 7a600a62..04102700 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-initctl.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-initctl.service
@@ -12,5 +12,5 @@ DefaultDependencies=no
 
 [Service]
 NotifyAccess=all
-ExecStart=/usr/lib/systemd/systemd-initctl
+ExecStart=/lib/systemd/systemd-initctl
 SystemCallArchitectures=native
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-initctl.socket b/core/modules/systemd/data/lib/systemd/system/systemd-initctl.socket
index f628c2e8..f628c2e8 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-initctl.socket
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-initctl.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journal-flush.service b/core/modules/systemd/data/lib/systemd/system/systemd-journal-flush.service
index 74342665..74342665 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journal-flush.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-journal-flush.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald-dev-log.socket b/core/modules/systemd/data/lib/systemd/system/systemd-journald-dev-log.socket
index ffd44bb5..ffd44bb5 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald-dev-log.socket
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-journald-dev-log.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald.service b/core/modules/systemd/data/lib/systemd/system/systemd-journald.service
index 38ee6d44..2b07e27c 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-journald.service
@@ -16,7 +16,7 @@ Before=sysinit.target
 [Service]
 Type=notify
 Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
-ExecStart=/usr/lib/systemd/systemd-journald
+ExecStart=/lib/systemd/systemd-journald
 Restart=always
 RestartSec=0
 StandardOutput=null
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald.socket b/core/modules/systemd/data/lib/systemd/system/systemd-journald.socket
index 71737014..71737014 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-journald.socket
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-journald.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-kexec.service b/core/modules/systemd/data/lib/systemd/system/systemd-kexec.service
index 91b5a58a..91b5a58a 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-kexec.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-kexec.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-logind.service b/core/modules/systemd/data/lib/systemd/system/systemd-logind.service
index 1cd60b9c..ba2b2e49 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-logind.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-logind.service
@@ -19,7 +19,7 @@ Wants=dbus.socket
 After=dbus.socket
 
 [Service]
-ExecStart=/usr/lib/systemd/systemd-logind
+ExecStart=/lib/systemd/systemd-logind
 Restart=always
 RestartSec=0
 BusName=org.freedesktop.login1
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-machine-id-commit.service b/core/modules/systemd/data/lib/systemd/system/systemd-machine-id-commit.service
index 58e7239b..58e7239b 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-machine-id-commit.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-machine-id-commit.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-machined.service b/core/modules/systemd/data/lib/systemd/system/systemd-machined.service
index ea30d064..bdd89828 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-machined.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-machined.service
@@ -14,7 +14,7 @@ After=machine.slice
 RequiresMountsFor=/var/lib/machines
 
 [Service]
-ExecStart=/usr/lib/systemd/systemd-machined
+ExecStart=/lib/systemd/systemd-machined
 BusName=org.freedesktop.machine1
 WatchdogSec=3min
 CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-modules-load.service b/core/modules/systemd/data/lib/systemd/system/systemd-modules-load.service
index 0f1a8521..ad2e777f 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-modules-load.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-modules-load.service
@@ -23,5 +23,5 @@ ConditionKernelCommandLine=|rd.modules-load
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-modules-load
+ExecStart=/lib/systemd/systemd-modules-load
 TimeoutSec=90s
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-nspawn@.service b/core/modules/systemd/data/lib/systemd/system/systemd-nspawn@.service
index d0dfe700..d0dfe700 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-nspawn@.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-nspawn@.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-poweroff.service b/core/modules/systemd/data/lib/systemd/system/systemd-poweroff.service
index 4749129d..4749129d 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-poweroff.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-poweroff.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-reboot.service b/core/modules/systemd/data/lib/systemd/system/systemd-reboot.service
index 49acabc9..49acabc9 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-reboot.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-reboot.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-remount-fs.service b/core/modules/systemd/data/lib/systemd/system/systemd-remount-fs.service
index 98222c6a..f46f9639 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-remount-fs.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-remount-fs.service
@@ -19,4 +19,4 @@ ConditionPathExists=/etc/fstab
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-remount-fs
+ExecStart=/lib/systemd/systemd-remount-fs
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-suspend.service b/core/modules/systemd/data/lib/systemd/system/systemd-suspend.service
index 5d242edd..0e53e1cc 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-suspend.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-suspend.service
@@ -14,4 +14,4 @@ After=sleep.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/systemd-sleep suspend
+ExecStart=/lib/systemd/systemd-sleep suspend
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-sysctl.service b/core/modules/systemd/data/lib/systemd/system/systemd-sysctl.service
index 1a150fd6..e5cbab4b 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-sysctl.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-sysctl.service
@@ -17,5 +17,5 @@ ConditionPathIsReadWrite=/proc/sys/net/
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-sysctl
+ExecStart=/lib/systemd/systemd-sysctl
 TimeoutSec=90s
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-sysusers.service b/core/modules/systemd/data/lib/systemd/system/systemd-sysusers.service
index 1802b313..1802b313 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-sysusers.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-sysusers.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-tmpfiles-setup-dev.service b/core/modules/systemd/data/lib/systemd/system/systemd-tmpfiles-setup-dev.service
index 761a4fc9..761a4fc9 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-tmpfiles-setup-dev.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-tmpfiles-setup-dev.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-tmpfiles-setup.service b/core/modules/systemd/data/lib/systemd/system/systemd-tmpfiles-setup.service
index fce1c42f..fce1c42f 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-tmpfiles-setup.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-tmpfiles-setup.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udev-settle.service b/core/modules/systemd/data/lib/systemd/system/systemd-udev-settle.service
index 20a89228..20a89228 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udev-settle.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-udev-settle.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udev-trigger.service b/core/modules/systemd/data/lib/systemd/system/systemd-udev-trigger.service
index fbc52694..fbc52694 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udev-trigger.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-udev-trigger.service
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd-control.socket b/core/modules/systemd/data/lib/systemd/system/systemd-udevd-control.socket
index 46f704ed..46f704ed 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd-control.socket
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-udevd-control.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd-kernel.socket b/core/modules/systemd/data/lib/systemd/system/systemd-udevd-kernel.socket
index 1a162069..1a162069 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd-kernel.socket
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-udevd-kernel.socket
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd.service b/core/modules/systemd/data/lib/systemd/system/systemd-udevd.service
index 17534c34..0f476d00 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-udevd.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-udevd.service
@@ -20,7 +20,7 @@ OOMScoreAdjust=-1000
 Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
 Restart=always
 RestartSec=0
-ExecStart=/usr/lib/systemd/systemd-udevd
+ExecStart=/lib/systemd/systemd-udevd
 KillMode=mixed
 WatchdogSec=3min
 TasksMax=infinity
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-update-utmp-runlevel.service b/core/modules/systemd/data/lib/systemd/system/systemd-update-utmp-runlevel.service
index 511f6679..6a58b9d0 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-update-utmp-runlevel.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-update-utmp-runlevel.service
@@ -18,4 +18,4 @@ Before=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/systemd-update-utmp runlevel
+ExecStart=/lib/systemd/systemd-update-utmp runlevel
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-update-utmp.service b/core/modules/systemd/data/lib/systemd/system/systemd-update-utmp.service
index b3651c64..82e2c053 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-update-utmp.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-update-utmp.service
@@ -17,5 +17,5 @@ Before=sysinit.target shutdown.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-update-utmp reboot
-ExecStop=/usr/lib/systemd/systemd-update-utmp shutdown
+ExecStart=/lib/systemd/systemd-update-utmp reboot
+ExecStop=/lib/systemd/systemd-update-utmp shutdown
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-user-sessions.service b/core/modules/systemd/data/lib/systemd/system/systemd-user-sessions.service
index 612c3a0b..e97e0eba 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-user-sessions.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-user-sessions.service
@@ -13,5 +13,5 @@ After=remote-fs.target nss-user-lookup.target network.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-user-sessions start
-ExecStop=/usr/lib/systemd/systemd-user-sessions stop
+ExecStart=/lib/systemd/systemd-user-sessions start
+ExecStop=/lib/systemd/systemd-user-sessions stop
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-vconsole-setup.service b/core/modules/systemd/data/lib/systemd/system/systemd-vconsole-setup.service
index ce60c1bb..90c4e21e 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-vconsole-setup.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-vconsole-setup.service
@@ -17,4 +17,4 @@ ConditionPathExists=/dev/tty0
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-vconsole-setup
+ExecStart=/lib/systemd/systemd-vconsole-setup
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/systemd-volatile-root.service b/core/modules/systemd/data/lib/systemd/system/systemd-volatile-root.service
index e7997791..8fedb740 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/systemd-volatile-root.service
+++ b/core/modules/systemd/data/lib/systemd/system/systemd-volatile-root.service
@@ -18,4 +18,4 @@ AssertPathExists=/etc/initrd-release
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/systemd-volatile-root yes /sysroot
+ExecStart=/lib/systemd/systemd-volatile-root yes /sysroot
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/time-sync.target b/core/modules/systemd/data/lib/systemd/system/time-sync.target
index debee741..debee741 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/time-sync.target
+++ b/core/modules/systemd/data/lib/systemd/system/time-sync.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/timers.target b/core/modules/systemd/data/lib/systemd/system/timers.target
index 251fa680..251fa680 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/timers.target
+++ b/core/modules/systemd/data/lib/systemd/system/timers.target
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/timers.target.wants/systemd-tmpfiles-clean.timer b/core/modules/systemd/data/lib/systemd/system/timers.target.wants/systemd-tmpfiles-clean.timer
index ea23a64d..ea23a64d 120000
--- a/core/modules/systemd/data/usr/lib/systemd/system/timers.target.wants/systemd-tmpfiles-clean.timer
+++ b/core/modules/systemd/data/lib/systemd/system/timers.target.wants/systemd-tmpfiles-clean.timer
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/user.slice b/core/modules/systemd/data/lib/systemd/system/user.slice
index 9fa6284c..9fa6284c 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/user.slice
+++ b/core/modules/systemd/data/lib/systemd/system/user.slice
diff --git a/core/modules/systemd/data/usr/lib/systemd/system/user@.service b/core/modules/systemd/data/lib/systemd/system/user@.service
index 9966ae33..4c9d9cd1 100644
--- a/core/modules/systemd/data/usr/lib/systemd/system/user@.service
+++ b/core/modules/systemd/data/lib/systemd/system/user@.service
@@ -13,7 +13,7 @@ After=systemd-user-sessions.service
 User=%i
 PAMName=systemd-user
 Type=notify
-ExecStart=-/usr/lib/systemd/systemd --user
+ExecStart=-/lib/systemd/systemd --user
 Slice=user-%i.slice
 KillMode=mixed
 Delegate=yes
diff --git a/core/modules/systemd/data/usr/lib/udev/rules.d/70-uaccess-floppy.rules b/core/modules/systemd/data/lib/udev/rules.d/70-uaccess-floppy.rules
index 113d288a..113d288a 100644
--- a/core/modules/systemd/data/usr/lib/udev/rules.d/70-uaccess-floppy.rules
+++ b/core/modules/systemd/data/lib/udev/rules.d/70-uaccess-floppy.rules
diff --git a/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/core/modules/systemd/data/lib/udev/rules.d/99-systemd.rules
index 3306c195..37c649d4 100644
--- a/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/core/modules/systemd/data/lib/udev/rules.d/99-systemd.rules
@@ -44,7 +44,7 @@ SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.tar
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
 
 # Apply sysctl variables to network devices (and only to those) as they appear.
-SUBSYSTEM=="net", KERNEL=="eth*", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
+SUBSYSTEM=="net", KERNEL=="eth*", RUN+="/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
 
 # Asynchronously mount file systems implemented by these modules as
 # soon as they are loaded.
diff --git a/core/modules/systemd/module.build b/core/modules/systemd/module.build
index 3cca1928..2ddd10d7 100644
--- a/core/modules/systemd/module.build
+++ b/core/modules/systemd/module.build
@@ -48,9 +48,11 @@ build () {
 	[ ! -e "./configure" ] && ./autogen.sh
 
 	./configure \
+		--prefix=/ \
 		--disable-manpages \
 		--enable-split-usr \
 		--sysconfdir="/etc" \
+		--runstatedir="/run" \
 		--enable-gtk-doc-html=no \
 		--disable-nls \
 		--disable-microhttpd \
diff --git a/core/modules/systemd/module.conf b/core/modules/systemd/module.conf
index 4ee773b9..ef64043e 100644
--- a/core/modules/systemd/module.conf
+++ b/core/modules/systemd/module.conf
@@ -57,7 +57,7 @@ REQUIRED_DIRECTORIES="
 	/usr/include
 	/usr/share/dbus-1
 	/usr/share/polkit-1
-	/usr/lib/udev
+	/lib/udev
 	/usr/lib/tmpfiles.d
-	/usr/lib/systemd/user
+	/lib/systemd/user
 "
diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf
index dfa86b3a..875c225f 100644
--- a/core/modules/xorg/module.conf
+++ b/core/modules/xorg/module.conf
@@ -24,6 +24,7 @@ REQUIRED_DIRECTORIES="
 			/usr/share/fonts
 			/usr/share/glvnd
 			/usr/share/X11
+			/lib/udev
 "
 REQUIRED_FILES="
 "
diff --git a/core/modules/xorg/module.conf.centos b/core/modules/xorg/module.conf.centos
index 22e4890a..e76a37ba 100644
--- a/core/modules/xorg/module.conf.centos
+++ b/core/modules/xorg/module.conf.centos
@@ -62,7 +62,6 @@ REQUIRED_LIBRARIES="
 "
 REQUIRED_DIRECTORIES+="
 			/usr/bin
-			/usr/lib/udev
 			/usr/$LIB64/xorg
 			/usr/share/fonts
 "
diff --git a/core/modules/xorg/module.conf.fedora b/core/modules/xorg/module.conf.fedora
index 7ffba4da..d2172ff1 100644
--- a/core/modules/xorg/module.conf.fedora
+++ b/core/modules/xorg/module.conf.fedora
@@ -64,7 +64,6 @@ REQUIRED_LIBRARIES="
 "
 REQUIRED_DIRECTORIES+="
 			/usr/bin
-			/usr/lib/udev
 			/usr/$LIB64/xorg
 			/usr/share/fonts
 "
diff --git a/core/modules/xorg/module.conf.opensuse b/core/modules/xorg/module.conf.opensuse
index 75c6b866..79fceb7e 100644
--- a/core/modules/xorg/module.conf.opensuse
+++ b/core/modules/xorg/module.conf.opensuse
@@ -51,7 +51,6 @@ REQUIRED_LIBRARIES="
 "
 REQUIRED_DIRECTORIES+="
 			/usr/bin
-			/usr/lib/udev
 			/usr/$LIB64/xorg
 			/usr/share/fonts
 "
diff --git a/core/modules/xorg/module.conf.opensuse.13.1 b/core/modules/xorg/module.conf.opensuse.13.1
index 29a3c4e5..1c11dfaf 100644
--- a/core/modules/xorg/module.conf.opensuse.13.1
+++ b/core/modules/xorg/module.conf.opensuse.13.1
@@ -87,7 +87,6 @@ REQUIRED_LIBRARIES="
 "
 REQUIRED_DIRECTORIES+="
 			/usr/bin
-			/usr/lib/udev
 			/usr/$LIB64/xorg
 			/usr/share/fonts
 "
diff --git a/core/modules/xorg/module.conf.opensuse.13.2 b/core/modules/xorg/module.conf.opensuse.13.2
index 894b9ed0..b1254e1b 100644
--- a/core/modules/xorg/module.conf.opensuse.13.2
+++ b/core/modules/xorg/module.conf.opensuse.13.2
@@ -84,7 +84,6 @@ REQUIRED_LIBRARIES="
 "
 REQUIRED_DIRECTORIES+="
 			/usr/bin
-			/usr/lib/udev
 			/usr/$LIB64/xorg
 			/usr/share/fonts
 "
diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init
index 4615a4fb..1ae27939 100755
--- a/core/rootfs/rootfs-stage31/data/init
+++ b/core/rootfs/rootfs-stage31/data/init
@@ -226,3 +226,4 @@ for init in "/lib/systemd/systemd" "/usr/lib/systemd/systemd"; do
 	exec /sbin/switch_root -c /dev/console /mnt "$init" $SD_CMDLINE
 done
 
+drop_shell "Da is irgendwie kein systemd im neuen root..."