Merge branch 'enhanced-test-framework' of git://fnordovax.org/dracut into test

Conflicts:
	modules.d/50plymouth/63-luks.rules
	modules.d/50plymouth/cryptroot.sh
	modules.d/50plymouth/install
	modules.d/90crypt/63-luks.rules
	modules.d/90crypt/cryptroot.sh
	modules.d/90crypt/install

diff --cc modules.d/90crypt/install
index f733c2a,250139c..fff2dce
--- 1/modules.d/90crypt/install
--- 2/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@@ -1,5 -1,5 +1,5 @@@
  #!/bin/bash
  inst cryptsetup
+ instmods dm_crypt cbc aes sha256
  inst_rules "$moddir/63-luks.rules"
 -inst "$moddir/cryptroot.sh" "/bin/cryptroot.sh"
 +inst "$moddir"/cryptroot-ask.sh /lib/udev/cryptroot-ask
- 

diff --cc modules.d/99base/init
index 39dd21a,2cf2f14..b081a93
--- 1/modules.d/99base/init
--- 2/modules.d/99base/init
+++ b/modules.d/99base/init
@@@ -28,11 -28,8 +28,10 @@@ source_all() 
      for f in "/$1"/*.sh; do [ -f "$f" ] && . "$f"; done
  }
  
- echo "Starting initrd..."
  export PATH=/sbin:/bin:/usr/sbin:/usr/bin
  export TERM=linux
 +NEWROOT="/sysroot"
 +
  trap "emergency_shell" 0
  
  mknod /dev/null c 1 3
@@@ -107,21 -66,20 +106,25 @@@ getarg 'break=mount' && emergency_shel
  # be sourced any number of times. As soon as one suceeds, no more are sourced.
  i=0
  while :; do
 +    [ -d "$NEWROOT/proc" ] && break;
 +
      for f in /mount/*.sh; do
 -      [ -x "$f" ] && . "$f";
 -      [ "$ROOTFS_MOUNTED" ] && break;
 +       [ -x "$f" ] && . "$f";
 +       [ "$ROOTFS_MOUNTED" ] && break;
      done
 -    [ "$ROOTFS_MOUNTED" ] && break;
 +
      sleep 1
      i=$(($i+1))
 -    [ $i -gt 10 ] && emergency_shell
 +    (
 +      flock -s 200
 +      [ $i -gt 10 ] && emergency_shell
 +    ) 200>/.console_lock
  done
  
+ # pre pivot scripts are sourced just before we switch over to the new root.
+ getarg 'break=pre-pivot' && emergency_shell
+ source_all pre-pivot
+ 
  # by the time we get here, the root filesystem should be mounted.
  # Try to find init.
  for i in "$(getarg init=)" /sbin/init /etc/init /init /bin/sh; do

diff --cc modules.d/99base/install
Simple merge