--- install2-remount-functions.orig	2014-06-11 02:20:54.000000000 +0400
+++ install2-remount-functions	2015-09-18 05:56:29.031966873 +0300
@@ -28,7 +28,7 @@
 		start_lvm &&
 		start_luks &&
 		mount_chroot \
-	) >& /tmp/remount.log || return $?
+	) >& /tmp/remount.log
 }
 
 # avoid automatic rpm shell.req dependency
@@ -90,6 +90,8 @@
 	grep " $destdir/" /proc/mounts |
 		while read dev mnt rest; do umount -v "$mnt"; done
 
+	umount -vl "$destdir/run" ||:
+	sleep 1
 	umount -v "$destdir" || return 1
 }
 
@@ -101,7 +103,7 @@
 stop_mdraid() {
 	# saving state is only important *after* evms
 	if [ -f /proc/mdstat -a -x "$MDADM" ]; then
-		"$MDADM" --examine --scan > /tmp/mdadm.conf
+		"$MDADM" --examine --scan | grep '^ARRAY /dev/md[0-9]' > /tmp/mdadm.conf
 		"$MDADM" --stop --scan
 	fi
 }
@@ -131,6 +133,7 @@
 			"$CRYPTSETUP" --key-file "$CRYPTSETUP_KEY" luksOpen "$device" "$(basename "$device")_luks"
 		done
 	fi
+	:
 }
 
 mount_chroot() {