diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
index 202ecb1c..6457cb0b 100755
--- a/modules.d/99shutdown/shutdown.sh
+++ b/modules.d/99shutdown/shutdown.sh
@@ -14,6 +14,12 @@ export TERM=linux
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 . /lib/dracut-lib.sh
 
+mkdir /oldsys
+for i in sys proc run dev; do
+    mkdir /oldsys/$i
+    mount --move /oldroot/$i /oldsys/$i
+done
+
 # if "kexec" was installed after creating the initramfs, we try to copy it from the real root
 # libz normally is pulled in via kmod/modprobe and udevadm
 if [ "$ACTION" = "kexec" ] && ! command -v kexec >/dev/null 2>&1; then
@@ -28,10 +34,6 @@ getarg 'rd.break=pre-shutdown' && emergency_shell --shutdown pre-shutdown "Break
 
 source_hook pre-shutdown
 
-if ! ( [ -x /bin/plymouth ] && /bin/plymouth --quit ); then
-    [ -x /oldroot/bin/plymouth ] && /oldroot/bin/plymouth --quit
-fi
-
 warn "Killing all remaining processes"
 
 killall_proc_mountpoint /oldroot