diff --git a/initramfs/etc_rc.d_rc.sysinit.sh b/initramfs/etc_rc.d_rc.sysinit.sh
index 63ef3eb..c7678bb 100644
--- a/initramfs/etc_rc.d_rc.sysinit.sh
+++ b/initramfs/etc_rc.d_rc.sysinit.sh
@@ -115,8 +115,8 @@ if [ -n "$idunn" ]; then
 		esac
 
 		case "$x" in
-		shell)		force_shell=$y ;;
-		lvm|mdadm)	eval use_${x}=$y ;;
+		shell|stop)	eval "force_shell=$y" ;;
+		lvm|mdadm)	eval "use_${x}=$y" ;;
 		esac
 	done
 fi
@@ -146,7 +146,7 @@ if [ "$use_mdadm" = "yes" ]; then
 	status
 fi
 
-if [ -s /etc/mdadm.conf ]; then
+if [ -s /etc/mdadm.conf -o -s /etc/mdadm/mdadm.conf ]; then
 	title "Starting RAID volumes"
 	check mdadm -As
 	sleep 1
@@ -165,3 +165,7 @@ if [ -n "$(ls -1 /etc/lvm/archive/*.vg 2> /dev/null)" ]; then
 	check vgchange -ay
 	status
 fi
+
+if [ "$force_shell" = 'yes' ]; then
+	touch /var/run/.idunn-stop
+fi