diff --git a/SOURCES/0462-network-do-not-check-firmware-boot-selected-flag.patch b/SOURCES/0462-network-do-not-check-firmware-boot-selected-flag.patch
index 688797d..9955a46 100644
--- a/SOURCES/0462-network-do-not-check-firmware-boot-selected-flag.patch
+++ b/SOURCES/0462-network-do-not-check-firmware-boot-selected-flag.patch
@@ -1,4 +1,4 @@
-From 435324c68c93007fd7cdf710c8094051a79ad48f Mon Sep 17 00:00:00 2001
+From 443d167a95499b827c2d8c9c3b61f4922c59ff7e Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 5 Oct 2016 12:46:39 +0200
Subject: [PATCH] network: do not check "firmware boot selected flag"
@@ -22,6 +22,3 @@ index 3459e89..9083aea 100755
[ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a)
[ -e ${iface}/origin ] && origin=$(read a < ${iface}/origin; echo $a)
[ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
---
-2.7.4
-
diff --git a/SOURCES/0463-add-README.md.patch b/SOURCES/0463-add-README.md.patch
new file mode 100644
index 0000000..8d6df50
--- /dev/null
+++ b/SOURCES/0463-add-README.md.patch
@@ -0,0 +1,21 @@
+From 05a38caaf25e221ba8154cebb9c6c601e6594445 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 20 Oct 2016 14:59:03 +0200
+Subject: [PATCH] add README.md
+
+---
+ README.md | 5 +++++
+ 1 file changed, 5 insertions(+)
+ create mode 100644 README.md
+
+diff --git a/README.md b/README.md
+new file mode 100644
+index 0000000..4c53f28
+--- /dev/null
++++ b/README.md
+@@ -0,0 +1,5 @@
++# dracut
++
++dracut is an initramfs infrastructure.
++
++CentOS CI Status: [](https://ci.centos.org/job/dracut-pr-build/)
diff --git a/SOURCES/0464-README.md-update.patch b/SOURCES/0464-README.md-update.patch
new file mode 100644
index 0000000..41eba0a
--- /dev/null
+++ b/SOURCES/0464-README.md-update.patch
@@ -0,0 +1,19 @@
+From 6dcb4867aeb463dd101947992b91781eec15e10f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 20 Oct 2016 15:27:53 +0200
+Subject: [PATCH] README.md: update
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 4c53f28..9617eaf 100644
+--- a/README.md
++++ b/README.md
+@@ -1,4 +1,4 @@
+-# dracut
++# dracut RHEL-7 branch
+
+ dracut is an initramfs infrastructure.
+
diff --git a/SOURCES/0465-test-test-rpms.txt-add-list-of-rpms-to-install.patch b/SOURCES/0465-test-test-rpms.txt-add-list-of-rpms-to-install.patch
new file mode 100644
index 0000000..a39949b
--- /dev/null
+++ b/SOURCES/0465-test-test-rpms.txt-add-list-of-rpms-to-install.patch
@@ -0,0 +1,42 @@
+From f432d367fc4fa7558761cb9bb4229e6c027bfa31 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 10 Nov 2016 13:57:26 +0100
+Subject: [PATCH] test/test-rpms.txt: add list of rpms to install
+
+---
+ test/test-rpms.txt | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+ create mode 100644 test/test-rpms.txt
+
+diff --git a/test/test-rpms.txt b/test/test-rpms.txt
+new file mode 100644
+index 0000000..1723d8e
+--- /dev/null
++++ b/test/test-rpms.txt
+@@ -0,0 +1,26 @@
++dash
++bridge-utils
++asciidoc
++mdadm
++lvm2
++dmraid
++cryptsetup
++nfs-utils
++nbd
++dhcp-server
++scsi-target-utils
++iscsi-initiator-utils
++net-tools
++strace
++syslinux
++python-imgcreate
++genisoimage
++btrfs-progs
++bridge-utils
++kmod-devel
++gcc
++bzip2
++xz
++tar
++wget
++rpm-build
diff --git a/SOURCES/0466-test-remove-sudo-calls.patch b/SOURCES/0466-test-remove-sudo-calls.patch
new file mode 100644
index 0000000..20143d7
--- /dev/null
+++ b/SOURCES/0466-test-remove-sudo-calls.patch
@@ -0,0 +1,682 @@
+From d2fd423a8de2cc4fa0325f5a371582f429c05a26 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 10 Nov 2016 14:57:05 +0100
+Subject: [PATCH] test: remove sudo calls
+
+rather run:
+
+$ sudo make check
+---
+ test/TEST-01-BASIC/test.sh | 4 ++--
+ test/TEST-02-SYSTEMD/test.sh | 4 ++--
+ test/TEST-03-USR-MOUNT/test.sh | 4 ++--
+ test/TEST-04-FULL-SYSTEMD/test.sh | 2 +-
+ test/TEST-10-RAID/test.sh | 4 ++--
+ test/TEST-11-LVM/test.sh | 4 ++--
+ test/TEST-12-RAID-DEG/test.sh | 4 ++--
+ test/TEST-13-ENC-RAID-LVM/test.sh | 4 ++--
+ test/TEST-14-IMSM/test.sh | 4 ++--
+ test/TEST-15-BTRFSRAID/test.sh | 4 ++--
+ test/TEST-16-DMSQUASH/test.sh | 4 ++--
+ test/TEST-17-LVM-THIN/test.sh | 4 ++--
+ test/TEST-20-NFS/test.sh | 16 ++++++++--------
+ test/TEST-30-ISCSI/test.sh | 16 ++++++++--------
+ test/TEST-40-NBD/test.sh | 24 ++++++++++++------------
+ test/TEST-50-MULTINIC/test.sh | 12 ++++++------
+ test/TEST-60-MTUMAC/test.sh | 10 +++++-----
+ test/TEST-70-BONDBRIDGETEAMVLAN/test.sh | 10 +++++-----
+ test/run-qemu | 2 +-
+ 19 files changed, 68 insertions(+), 68 deletions(-)
+
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index aef0737..97e8017 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -45,7 +45,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -85,7 +85,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug watchdog" \
+ -o "plymouth" \
+ -d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \
+diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
+index 6f33181..2a077b0 100755
+--- a/test/TEST-02-SYSTEMD/test.sh
++++ b/test/TEST-02-SYSTEMD/test.sh
+@@ -45,7 +45,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -85,7 +85,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug systemd" \
+ -o "network plymouth" \
+ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
+diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
+index 363f8b0..c3f810a 100755
+--- a/test/TEST-03-USR-MOUNT/test.sh
++++ b/test/TEST-03-USR-MOUNT/test.sh
+@@ -72,7 +72,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -119,7 +119,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug" \
+ -o "network plymouth" \
+ -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
+diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
+index 93c3389..1adb34e 100755
+--- a/test/TEST-04-FULL-SYSTEMD/test.sh
++++ b/test/TEST-04-FULL-SYSTEMD/test.sh
+@@ -263,7 +263,7 @@ EOF
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -a "debug systemd" \
+ -I "/etc/machine-id /etc/hostname" \
+ -o "network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
+diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
+index 45edda2..7f99c0e 100755
+--- a/test/TEST-10-RAID/test.sh
++++ b/test/TEST-10-RAID/test.sh
+@@ -43,7 +43,7 @@ test_setup() {
+ inst_multiple -o /lib/systemd/systemd-shutdown
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -88,7 +88,7 @@ test_setup() {
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
+index dd1f8ea..a4ee86d 100755
+--- a/test/TEST-11-LVM/test.sh
++++ b/test/TEST-11-LVM/test.sh
+@@ -40,7 +40,7 @@ test_setup() {
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+ mkdir $initdir/run
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -74,7 +74,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
+index 5f9cfc5..aae5e8b 100755
+--- a/test/TEST-12-RAID-DEG/test.sh
++++ b/test/TEST-12-RAID-DEG/test.sh
+@@ -81,7 +81,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -131,7 +131,7 @@ test_setup() {
+ echo -n test > $initdir/etc/key
+ )
+
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
+index 94801e4..8194166 100755
+--- a/test/TEST-13-ENC-RAID-LVM/test.sh
++++ b/test/TEST-13-ENC-RAID-LVM/test.sh
+@@ -77,7 +77,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -127,7 +127,7 @@ test_setup() {
+ done > $initdir/etc/crypttab
+ echo -n test > $initdir/etc/key
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
+index 8e99b1f..783ec4a 100755
+--- a/test/TEST-14-IMSM/test.sh
++++ b/test/TEST-14-IMSM/test.sh
+@@ -70,7 +70,7 @@ test_setup() {
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+ mkdir $initdir/run
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -109,7 +109,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
+index c086677..1e3e18c 100755
+--- a/test/TEST-15-BTRFSRAID/test.sh
++++ b/test/TEST-15-BTRFSRAID/test.sh
+@@ -41,7 +41,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -82,7 +82,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
+diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
+index e80ec5c..6daa35e 100755
+--- a/test/TEST-16-DMSQUASH/test.sh
++++ b/test/TEST-16-DMSQUASH/test.sh
+@@ -38,7 +38,7 @@ test_setup() {
+
+ dd if=/dev/zero of="$TESTDIR"/root.img count=100
+
+- sudo $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
++ $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
+ -a "debug dmsquash-live" \
+ -d "piix ide-gd_mod ata_piix ext3 sd_mod sr_mod" \
+ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+@@ -69,7 +69,7 @@ test_setup() {
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ (cd "$initdir"; mkdir -p -- dev sys proc etc var/run tmp )
+ cp -a -- /etc/ld.so.conf* "$initdir"/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+ python create.py -d -c livecd-fedora-minimal.ks
+ return 0
+diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
+index dc6e588..f15e1a3 100755
+--- a/test/TEST-17-LVM-THIN/test.sh
++++ b/test/TEST-17-LVM-THIN/test.sh
+@@ -40,7 +40,7 @@ test_setup() {
+ (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+ cp -a /etc/ld.so.conf* $initdir/etc
+ mkdir $initdir/run
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -74,7 +74,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network" \
+ -a "debug" -I lvs \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
+index 49dbc10..64fc550 100755
+--- a/test/TEST-20-NFS/test.sh
++++ b/test/TEST-20-NFS/test.sh
+@@ -26,7 +26,7 @@ run_server() {
+ -append "rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.server \
+ -pidfile $TESTDIR/server.pid -daemonize || return 1
+- sudo chmod 644 $TESTDIR/server.pid || return 1
++ chmod 644 $TESTDIR/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -185,7 +185,7 @@ test_nfsv4() {
+
+ test_run() {
+ if [[ -s server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+
+@@ -200,7 +200,7 @@ test_run() {
+ ret=$?
+
+ if [[ -s $TESTDIR/server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+
+@@ -212,7 +212,7 @@ test_setup() {
+ dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60
+ mke2fs -j -F $TESTDIR/server.ext3
+ mkdir $TESTDIR/mnt
+- sudo mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
++ mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
+
+
+ export kernel=$KVERSION
+@@ -279,7 +279,7 @@ test_setup() {
+ inst /etc/group /etc/group
+
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ dracut_kernel_post
+ )
+
+@@ -318,14 +318,14 @@ test_setup() {
+ inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
+
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ mkdir -p $TESTDIR/mnt/nfs/nfs3-5
+ mkdir -p $TESTDIR/mnt/nfs/ip/192.168.50.101
+ mkdir -p $TESTDIR/mnt/nfs/tftpboot/nfs4-5
+
+- sudo umount $TESTDIR/mnt
++ umount $TESTDIR/mnt
+ rm -fr -- $TESTDIR/mnt
+
+ # Make an overlay with needed tools for the test harness
+@@ -354,7 +354,7 @@ test_setup() {
+
+ test_cleanup() {
+ if [[ -s $TESTDIR/server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+ }
+diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
+index 5e59f0a..62bef9c 100755
+--- a/test/TEST-30-ISCSI/test.sh
++++ b/test/TEST-30-ISCSI/test.sh
+@@ -28,7 +28,7 @@ run_server() {
+ -append "root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
+ -initrd $TESTDIR/initramfs.server \
+ -pidfile $TESTDIR/server.pid -daemonize || return 1
+- sudo chmod 644 $TESTDIR/server.pid || return 1
++ chmod 644 $TESTDIR/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -129,7 +129,7 @@ test_run() {
+ do_test_run
+ ret=$?
+ if [[ -s $TESTDIR/server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+ return $ret
+@@ -169,7 +169,7 @@ test_setup() {
+ inst_simple /etc/os-release
+ inst ./client-init.sh /sbin/init
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -216,7 +216,7 @@ test_setup() {
+ inst_hook emergency 000 ./hard-off.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth dmraid nfs" \
+ -a "debug" \
+ -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \
+@@ -227,7 +227,7 @@ test_setup() {
+ dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60
+ mkfs.ext3 -j -F $TESTDIR/server.ext3
+ mkdir $TESTDIR/mnt
+- sudo mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
++ mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
+
+ kernel=$KVERSION
+ (
+@@ -259,11 +259,11 @@ test_setup() {
+ inst /etc/group /etc/group
+
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ dracut_kernel_post
+ )
+
+- sudo umount $TESTDIR/mnt
++ umount $TESTDIR/mnt
+ rm -fr -- $TESTDIR/mnt
+
+ # Make server's dracut image
+@@ -277,7 +277,7 @@ test_setup() {
+
+ test_cleanup() {
+ if [[ -s $TESTDIR/server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+ }
+diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
+index 848a103..73123c2 100755
+--- a/test/TEST-40-NBD/test.sh
++++ b/test/TEST-40-NBD/test.sh
+@@ -26,7 +26,7 @@ run_server() {
+ -kernel /boot/vmlinuz-$KVERSION \
+ -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
+- sudo chmod 644 $TESTDIR/server.pid || return 1
++ chmod 644 $TESTDIR/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -179,7 +179,7 @@ client_run() {
+ "root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1
+
+ if [[ -s server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+
+@@ -207,7 +207,7 @@ make_encrypted_root() {
+ inst_simple /etc/os-release
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+ # second, install the files needed to make the root filesystem
+@@ -247,7 +247,7 @@ make_client_root() {
+ dd if=/dev/null of=$TESTDIR/nbd.ext2 bs=1M seek=30
+ mke2fs -F -j $TESTDIR/nbd.ext2
+ mkdir $TESTDIR/mnt
+- sudo mount -o loop $TESTDIR/nbd.ext2 $TESTDIR/mnt
++ mount -o loop $TESTDIR/nbd.ext2 $TESTDIR/mnt
+
+ kernel=$KVERSION
+ (
+@@ -271,10 +271,10 @@ make_client_root() {
+ inst $i
+ done
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+- sudo umount $TESTDIR/mnt
++ umount $TESTDIR/mnt
+ rm -fr -- $TESTDIR/mnt
+ }
+
+@@ -282,7 +282,7 @@ make_server_root() {
+ dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=30
+ mke2fs -F $TESTDIR/server.ext2
+ mkdir $TESTDIR/mnt
+- sudo mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt
++ mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt
+
+ kernel=$KVERSION
+ (
+@@ -316,10 +316,10 @@ make_server_root() {
+ done
+
+ cp -a /etc/ld.so.conf* $initdir/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+- sudo umount $TESTDIR/mnt
++ umount $TESTDIR/mnt
+ rm -fr -- $TESTDIR/mnt
+ }
+
+@@ -347,12 +347,12 @@ test_setup() {
+ echo -n test > $initdir/etc/key
+ )
+
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -m "udev-rules rootfs-block fs-lib base debug kernel-modules" \
+ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \
+ -f $TESTDIR/initramfs.server $KVERSION || return 1
+
+- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
++ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth" \
+ -a "debug watchdog" \
+ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esb ib700wdt" \
+@@ -361,7 +361,7 @@ test_setup() {
+
+ kill_server() {
+ if [[ -s $TESTDIR/server.pid ]]; then
+- sudo kill -TERM $(cat $TESTDIR/server.pid)
++ kill -TERM $(cat $TESTDIR/server.pid)
+ rm -f -- $TESTDIR/server.pid
+ fi
+ }
+diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
+index 05273be..642a748 100755
+--- a/test/TEST-50-MULTINIC/test.sh
++++ b/test/TEST-50-MULTINIC/test.sh
+@@ -26,7 +26,7 @@ run_server() {
+ -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+- sudo chmod 644 -- "$TESTDIR"/server.pid || return 1
++ chmod 644 -- "$TESTDIR"/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -159,7 +159,7 @@ test_setup() {
+ dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=60
+ mke2fs -j -F -- "$TESTDIR"/server.ext3
+ mkdir -- "$TESTDIR"/mnt
+- sudo mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
++ mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
+
+ (
+ export initdir="$TESTDIR"/mnt
+@@ -222,7 +222,7 @@ test_setup() {
+ inst /etc/group /etc/group
+
+ cp -a -- /etc/ld.so.conf* "$initdir"/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ dracut_kernel_post
+ )
+
+@@ -260,10 +260,10 @@ test_setup() {
+ inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
+
+ cp -a -- /etc/ld.so.conf* "$initdir"/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+- sudo umount "$TESTDIR"/mnt
++ umount "$TESTDIR"/mnt
+ rm -fr -- "$TESTDIR"/mnt
+
+ # Make an overlay with needed tools for the test harness
+@@ -291,7 +291,7 @@ test_setup() {
+
+ kill_server() {
+ if [[ -s "$TESTDIR"/server.pid ]]; then
+- sudo kill -TERM -- $(cat "$TESTDIR"/server.pid)
++ kill -TERM -- $(cat "$TESTDIR"/server.pid)
+ rm -f -- "$TESTDIR"/server.pid
+ fi
+ }
+diff --git a/test/TEST-60-MTUMAC/test.sh b/test/TEST-60-MTUMAC/test.sh
+index 7633ac1..b70e316 100755
+--- a/test/TEST-60-MTUMAC/test.sh
++++ b/test/TEST-60-MTUMAC/test.sh
+@@ -25,7 +25,7 @@ run_server() {
+ -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+- sudo chmod 644 -- "$TESTDIR"/server.pid || return 1
++ chmod 644 -- "$TESTDIR"/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -136,7 +136,7 @@ test_setup() {
+ dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=60
+ mke2fs -j -F -- "$TESTDIR"/server.ext3
+ mkdir -- "$TESTDIR"/mnt
+- sudo mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
++ mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
+
+ (
+ export initdir="$TESTDIR"/mnt
+@@ -237,10 +237,10 @@ test_setup() {
+ inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
+
+ cp -a -- /etc/ld.so.conf* "$initdir"/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+- sudo umount "$TESTDIR"/mnt
++ umount "$TESTDIR"/mnt
+ rm -fr -- "$TESTDIR"/mnt
+
+ # Make an overlay with needed tools for the test harness
+@@ -270,7 +270,7 @@ test_setup() {
+
+ kill_server() {
+ if [[ -s "$TESTDIR"/server.pid ]]; then
+- sudo kill -TERM -- $(cat "$TESTDIR"/server.pid)
++ kill -TERM -- $(cat "$TESTDIR"/server.pid)
+ rm -f -- "$TESTDIR"/server.pid
+ fi
+ }
+diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+index 54ceb9e..dcf9d5c 100755
+--- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
++++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+@@ -32,7 +32,7 @@ run_server() {
+ -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+- sudo chmod 644 -- "$TESTDIR"/server.pid || return 1
++ chmod 644 -- "$TESTDIR"/server.pid || return 1
+
+ # Cleanup the terminal if we have one
+ tty -s && stty sane
+@@ -162,7 +162,7 @@ test_setup() {
+ dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=60
+ mke2fs -j -F -- "$TESTDIR"/server.ext3
+ mkdir -- "$TESTDIR"/mnt
+- sudo mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
++ mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
+
+ (
+ export initdir="$TESTDIR"/mnt
+@@ -263,10 +263,10 @@ test_setup() {
+ inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
+
+ cp -a -- /etc/ld.so.conf* "$initdir"/etc
+- sudo ldconfig -r "$initdir"
++ ldconfig -r "$initdir"
+ )
+
+- sudo umount "$TESTDIR"/mnt
++ umount "$TESTDIR"/mnt
+ rm -fr -- "$TESTDIR"/mnt
+
+ # Make an overlay with needed tools for the test harness
+@@ -296,7 +296,7 @@ test_setup() {
+
+ kill_server() {
+ if [[ -s "$TESTDIR"/server.pid ]]; then
+- sudo kill -TERM -- $(cat "$TESTDIR"/server.pid)
++ kill -TERM -- $(cat "$TESTDIR"/server.pid)
+ rm -f -- "$TESTDIR"/server.pid
+ fi
+ }
+diff --git a/test/run-qemu b/test/run-qemu
+index 00c2f6a..07ce4a5 100755
+--- a/test/run-qemu
++++ b/test/run-qemu
+@@ -25,4 +25,4 @@ else
+ VMLINUZ="/boot/vmlinuz-${KVERSION}"
+ fi
+
+-exec sudo $BIN $ARGS -kernel $VMLINUZ "$@"
++exec $BIN $ARGS -kernel $VMLINUZ "$@"
diff --git a/SOURCES/0467-TEST-ISCSI-fix-command-check.patch b/SOURCES/0467-TEST-ISCSI-fix-command-check.patch
new file mode 100644
index 0000000..91095fa
--- /dev/null
+++ b/SOURCES/0467-TEST-ISCSI-fix-command-check.patch
@@ -0,0 +1,24 @@
+From 13a61f82ba6379d407d45bb9225099cd755e3c5b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 11:34:33 +0100
+Subject: [PATCH] TEST-ISCSI: fix command check
+
+---
+ test/TEST-30-ISCSI/test.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
+index 62bef9c..da86b83 100755
+--- a/test/TEST-30-ISCSI/test.sh
++++ b/test/TEST-30-ISCSI/test.sh
+@@ -136,8 +136,8 @@ test_run() {
+ }
+
+ test_setup() {
+- if [ ! -x /usr/sbin/iscsi-target ]; then
+- echo "Need iscsi-target from netbsd-iscsi"
++ if ! command -v tgtd &>/dev/null || ! command -v tgtadm &>/dev/null; then
++ echo "Need tgtd and tgtadm from scsi-target-utils"
+ return 1
+ fi
+
diff --git a/SOURCES/0468-test-test-rpms.txt-add-gzip.patch b/SOURCES/0468-test-test-rpms.txt-add-gzip.patch
new file mode 100644
index 0000000..5404f93
--- /dev/null
+++ b/SOURCES/0468-test-test-rpms.txt-add-gzip.patch
@@ -0,0 +1,21 @@
+From 7b4173d698be5163da1e5b5b52bafd2facba4db5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 11:40:58 +0100
+Subject: [PATCH] test/test-rpms.txt: add gzip
+
+---
+ test/test-rpms.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/test-rpms.txt b/test/test-rpms.txt
+index 1723d8e..10596da 100644
+--- a/test/test-rpms.txt
++++ b/test/test-rpms.txt
+@@ -19,6 +19,7 @@ btrfs-progs
+ bridge-utils
+ kmod-devel
+ gcc
++gzip
+ bzip2
+ xz
+ tar
diff --git a/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch b/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch
new file mode 100644
index 0000000..8e82267
--- /dev/null
+++ b/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch
@@ -0,0 +1,21 @@
+From 81bb61b52577d1866c9faf9ec8112892c4ba428a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 11:42:54 +0100
+Subject: [PATCH] TEST-99-RPM: ignore openldap leftovers
+
+---
+ test/TEST-99-RPM/test.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
+index 5afc313..fc68273 100755
+--- a/test/TEST-99-RPM/test.sh
++++ b/test/TEST-99-RPM/test.sh
+@@ -54,6 +54,7 @@ find / -xdev -type f -not -path '/var/*' \
+ -not -path '/dev/null' \
+ -not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \
+ -not -path "/boot/\$(cat /etc/machine-id)/*" \
++ -not -path '/etc/openldap/certs/*' \
+ -exec rpm -qf '{}' ';' | \
+ grep -F 'not owned' &> /test.output
+ exit
diff --git a/SOURCES/0470-test-Makefile-proper-return-code-for-make-check.patch b/SOURCES/0470-test-Makefile-proper-return-code-for-make-check.patch
new file mode 100644
index 0000000..a82cbfe
--- /dev/null
+++ b/SOURCES/0470-test-Makefile-proper-return-code-for-make-check.patch
@@ -0,0 +1,31 @@
+From aa40b82145ecc923edfade8149c2ba892bfb664d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 12:18:06 +0100
+Subject: [PATCH] test/Makefile: proper return code for "make check"
+
+---
+ test/Makefile | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index f71f854..eaa944f 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -2,13 +2,14 @@
+
+ check:
+ @[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
+- @for i in TEST-[0-9]*; do \
++ @{ ret=0; \
++ for i in TEST-[0-9]*; do \
+ [ -d $$i ] || continue ; \
+ [ -f $$i/Makefile ] || continue ; \
+ if [ -n "$$TESTS" ]; then t=$${i##TEST-}; t=$${t%%-*}; [ "$${TESTS#*$$t*}" != "$$TESTS" ] || continue; fi; \
+ if [ -n "$$SKIP" ]; then t=$${i##TEST-}; t=$${t%%-*}; [ "$${SKIP#*$$t*}" != "$$SKIP" ] && continue; fi; \
+- $(MAKE) -C $$i all ; \
+- done
++ $(MAKE) -C $$i all ; ret=$$((ret + $$?)); \
++ done; exit $$ret; }
+
+ clean:
+ @for i in TEST-[0-9]*; do \
diff --git a/SOURCES/0471-test-rpms.txt-add-dhcp.patch b/SOURCES/0471-test-rpms.txt-add-dhcp.patch
new file mode 100644
index 0000000..31f72c2
--- /dev/null
+++ b/SOURCES/0471-test-rpms.txt-add-dhcp.patch
@@ -0,0 +1,21 @@
+From a081e072d894c91fcf037e267cb6793c4b0356c4 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 12:34:00 +0100
+Subject: [PATCH] test-rpms.txt: add dhcp
+
+---
+ test/test-rpms.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/test-rpms.txt b/test/test-rpms.txt
+index 10596da..95376bd 100644
+--- a/test/test-rpms.txt
++++ b/test/test-rpms.txt
+@@ -8,6 +8,7 @@ cryptsetup
+ nfs-utils
+ nbd
+ dhcp-server
++dhcp
+ scsi-target-utils
+ iscsi-initiator-utils
+ net-tools
diff --git a/SOURCES/0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch b/SOURCES/0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch
new file mode 100644
index 0000000..91765e0
--- /dev/null
+++ b/SOURCES/0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch
@@ -0,0 +1,22 @@
+From afeb39aa8544eb4e006421107e411a79558a683e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 13:11:36 +0100
+Subject: [PATCH] TEST-30-ISCSI/test.sh: set device timeout
+
+---
+ test/TEST-30-ISCSI/test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
+index da86b83..a610b0e 100755
+--- a/test/TEST-30-ISCSI/test.sh
++++ b/test/TEST-30-ISCSI/test.sh
+@@ -49,7 +49,7 @@ run_client() {
+ -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
+ -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
+ -net socket,connect=127.0.0.1:12330 \
+- -append "rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
++ -append "rw rd.auto rd.device.timeout=300 rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
+ -initrd $TESTDIR/initramfs.testing
+ if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
+ echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
diff --git a/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch b/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch
new file mode 100644
index 0000000..ab6035d
--- /dev/null
+++ b/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch
@@ -0,0 +1,38 @@
+From ba5efdcffa8e481b2442fea800d717b45fed240a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 13:45:00 +0100
+Subject: [PATCH] TEST-70-BONDBRIDGETEAMVLAN: fix server ip setup
+
+---
+ test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
+index 9585a47..9f45c42 100755
+--- a/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
++++ b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
+@@ -58,7 +58,6 @@ ip addr add 192.168.50.1/24 dev ens3
+ linkup ens3
+ >/dev/watchdog
+ ip link set dev eth1 name ens4
+-linkup ens4
+ ip link add dev ens4.1 link ens4 type vlan id 1
+ ip link add dev ens4.2 link ens4 type vlan id 2
+ ip link add dev ens4.3 link ens4 type vlan id 3
+@@ -67,13 +66,12 @@ ip addr add 192.168.54.1/24 dev ens4.1
+ ip addr add 192.168.55.1/24 dev ens4.2
+ ip addr add 192.168.56.1/24 dev ens4.3
+ ip addr add 192.168.57.1/24 dev ens4.4
+-ip link set dev eth2 name ens5
+-ip link set dev eth3 name ens6
+ linkup ens4
++ip link set dev eth2 name ens5
++ip addr add 192.168.51.1/24 dev ens5
+ linkup ens5
++ip link set dev eth3 name ens6
+ linkup ens6
+-ip addr add 192.168.51.1/24 dev ens5
+-linkup ens4
+ >/dev/watchdog
+ modprobe af_packet
+ > /dev/watchdog
diff --git a/SOURCES/0474-testsuite-guard-against-kernel-panic.patch b/SOURCES/0474-testsuite-guard-against-kernel-panic.patch
new file mode 100644
index 0000000..86ba1e3
--- /dev/null
+++ b/SOURCES/0474-testsuite-guard-against-kernel-panic.patch
@@ -0,0 +1,372 @@
+From 904c466cdb424a10c68cc97d8974754acd04dad9 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 13:45:24 +0100
+Subject: [PATCH] testsuite: guard against kernel panic
+
+call qemu with --no-reboot and append "panic=1" to the kernel cmdline
+---
+ test/TEST-01-BASIC/test.sh | 3 ++-
+ test/TEST-02-SYSTEMD/test.sh | 3 ++-
+ test/TEST-03-USR-MOUNT/test.sh | 3 ++-
+ test/TEST-04-FULL-SYSTEMD/test.sh | 3 ++-
+ test/TEST-10-RAID/test.sh | 3 ++-
+ test/TEST-11-LVM/test.sh | 3 ++-
+ test/TEST-12-RAID-DEG/test.sh | 3 ++-
+ test/TEST-13-ENC-RAID-LVM/test.sh | 9 ++++++---
+ test/TEST-14-IMSM/test.sh | 3 ++-
+ test/TEST-15-BTRFSRAID/test.sh | 3 ++-
+ test/TEST-16-DMSQUASH/test.sh | 3 ++-
+ test/TEST-17-LVM-THIN/test.sh | 3 ++-
+ test/TEST-20-NFS/test.sh | 6 ++++--
+ test/TEST-30-ISCSI/test.sh | 6 ++++--
+ test/TEST-40-NBD/test.sh | 6 ++++--
+ test/TEST-50-MULTINIC/test.sh | 6 ++++--
+ test/TEST-60-MTUMAC/test.sh | 6 ++++--
+ test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf | 2 +-
+ test/TEST-70-BONDBRIDGETEAMVLAN/test.sh | 6 ++++--
+ 19 files changed, 53 insertions(+), 27 deletions(-)
+
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index 97e8017..6b79dee 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -14,7 +14,8 @@ test_run() {
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+ -watchdog i6300esb -watchdog-action poweroff \
+- -append "root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing || return 1
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
+ }
+diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
+index 2a077b0..2359180 100755
+--- a/test/TEST-02-SYSTEMD/test.sh
++++ b/test/TEST-02-SYSTEMD/test.sh
+@@ -13,7 +13,8 @@ test_run() {
+ -hdb $TESTDIR/marker.disk \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=LABEL=dracut rw loglevel=77 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=LABEL=dracut rw loglevel=77 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/marker.disk || return 1
+ }
+diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
+index c3f810a..cd6f282 100755
+--- a/test/TEST-03-USR-MOUNT/test.sh
++++ b/test/TEST-03-USR-MOUNT/test.sh
+@@ -20,7 +20,8 @@ client_run() {
+ -hdc $TESTDIR/result \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+
+ if (($? != 0)); then
+diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
+index 1adb34e..13ab37b 100755
+--- a/test/TEST-04-FULL-SYSTEMD/test.sh
++++ b/test/TEST-04-FULL-SYSTEMD/test.sh
+@@ -22,7 +22,8 @@ client_run() {
+ -hdc $TESTDIR/result \
+ -m 256M -smp 2 -nographic \
+ -net none \
+- -append "$client_opts rd.device.timeout=20 rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 $client_opts rd.device.timeout=20 rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+
+ if (($? != 0)); then
+diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
+index 7f99c0e..364f7d5 100755
+--- a/test/TEST-10-RAID/test.sh
++++ b/test/TEST-10-RAID/test.sh
+@@ -12,7 +12,8 @@ test_run() {
+ -hda $DISKIMAGE \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
+ }
+diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
+index a4ee86d..fb00946 100755
+--- a/test/TEST-11-LVM/test.sh
++++ b/test/TEST-11-LVM/test.sh
+@@ -11,7 +11,8 @@ test_run() {
+ -hda $TESTDIR/root.ext2 \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
+ }
+diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
+index aae5e8b..d4cb9d0 100755
+--- a/test/TEST-12-RAID-DEG/test.sh
++++ b/test/TEST-12-RAID-DEG/test.sh
+@@ -19,7 +19,8 @@ client_run() {
+ -hdc $TESTDIR/disk2.img.new \
+ -hdd $TESTDIR/disk3.img.new \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
++ -no-reboot \
++ -append "panic=1 $* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
+ -initrd $TESTDIR/initramfs.testing
+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
+ echo "CLIENT TEST END: $@ [FAIL]"
+diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
+index 8194166..196dd3b 100755
+--- a/test/TEST-13-ENC-RAID-LVM/test.sh
++++ b/test/TEST-13-ENC-RAID-LVM/test.sh
+@@ -19,7 +19,8 @@ test_run() {
+ -hdb $TESTDIR/check-success.img \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 $LUKSARGS rd.device.timeout=40 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 $LUKSARGS rd.device.timeout=40 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
+ echo "CLIENT TEST END: [OK]"
+@@ -32,7 +33,8 @@ test_run() {
+ -hdb $TESTDIR/check-success.img \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.device.timeout=40 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.device.timeout=40 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
+ echo "CLIENT TEST END: [OK]"
+@@ -45,7 +47,8 @@ test_run() {
+ -hdb $TESTDIR/check-success.img \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.luks.uuid=failme rd.device.timeout=40 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.luks.uuid=failme rd.device.timeout=40 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
+ echo "CLIENT TEST END: [OK]"
+diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
+index 783ec4a..4e5d665 100755
+--- a/test/TEST-14-IMSM/test.sh
++++ b/test/TEST-14-IMSM/test.sh
+@@ -15,7 +15,8 @@ client_run() {
+ -hdc $TESTDIR/disk2 \
+ -m 256M -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "$* root=LABEL=root rw debug rd.retry=20 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 $* root=LABEL=root rw debug rd.retry=20 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
+ echo "CLIENT TEST END: $@ [FAIL]"
+diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
+index 1e3e18c..51ffd96 100755
+--- a/test/TEST-15-BTRFSRAID/test.sh
++++ b/test/TEST-15-BTRFSRAID/test.sh
+@@ -11,7 +11,8 @@ test_run() {
+ -hda $DISKIMAGE \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ dd if=$DISKIMAGE bs=512 count=2 | grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
+ }
+diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
+index 6daa35e..3b4600e 100755
+--- a/test/TEST-16-DMSQUASH/test.sh
++++ b/test/TEST-16-DMSQUASH/test.sh
+@@ -21,7 +21,8 @@ test_run() {
+ -hda "$TESTDIR"/root.img \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "root=live:CDLABEL=LiveCD live rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=live:CDLABEL=LiveCD live rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
+ -initrd "$TESTDIR"/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success -- "$TESTDIR"/root.img || return 1
+ }
+diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
+index f15e1a3..9a9ed6f 100755
+--- a/test/TEST-17-LVM-THIN/test.sh
++++ b/test/TEST-17-LVM-THIN/test.sh
+@@ -11,7 +11,8 @@ test_run() {
+ -hda $TESTDIR/root.ext2 \
+ -m 256M -smp 2 -nographic \
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
++ -no-reboot \
++ -append "panic=1 root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
+ }
+diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
+index 64fc550..9e02a18 100755
+--- a/test/TEST-20-NFS/test.sh
++++ b/test/TEST-20-NFS/test.sh
+@@ -23,7 +23,8 @@ run_server() {
+ -serial ${SERIAL:-null} \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-$KVERSION \
+- -append "rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.server \
+ -pidfile $TESTDIR/server.pid -daemonize || return 1
+ chmod 644 $TESTDIR/server.pid || return 1
+@@ -58,7 +59,8 @@ client_test() {
+ -net socket,connect=127.0.0.1:12320 \
+ -kernel /boot/vmlinuz-$KVERSION \
+ -watchdog i6300esb -watchdog-action poweroff \
+- -append "$cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 $cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.testing
+
+ if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nfs-OK $TESTDIR/client.img; then
+diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
+index a610b0e..a82a950 100755
+--- a/test/TEST-30-ISCSI/test.sh
++++ b/test/TEST-30-ISCSI/test.sh
+@@ -25,7 +25,8 @@ run_server() {
+ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
+ -net nic,macaddr=52:54:00:12:34:57,model=e1000 \
+ -net socket,listen=127.0.0.1:12330 \
+- -append "root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
++ -no-reboot \
++ -append "panic=1 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
+ -initrd $TESTDIR/initramfs.server \
+ -pidfile $TESTDIR/server.pid -daemonize || return 1
+ chmod 644 $TESTDIR/server.pid || return 1
+@@ -49,7 +50,8 @@ run_client() {
+ -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
+ -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
+ -net socket,connect=127.0.0.1:12330 \
+- -append "rw rd.auto rd.device.timeout=300 rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
++ -no-reboot \
++ -append "panic=1 rw rd.auto rd.device.timeout=300 rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
+ -initrd $TESTDIR/initramfs.testing
+ if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
+ echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
+diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
+index 73123c2..a781ef0 100755
+--- a/test/TEST-40-NBD/test.sh
++++ b/test/TEST-40-NBD/test.sh
+@@ -24,7 +24,8 @@ run_server() {
+ -net socket,listen=127.0.0.1:12340 \
+ -serial $SERIAL \
+ -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
+ chmod 644 $TESTDIR/server.pid || return 1
+
+@@ -61,7 +62,8 @@ client_test() {
+ -net nic,macaddr=$mac,model=e1000 \
+ -net socket,connect=127.0.0.1:12340 \
+ -kernel /boot/vmlinuz-$KVERSION \
+- -append "$cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \
++ -no-reboot \
++ -append "panic=1 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \
+ -initrd $TESTDIR/initramfs.testing
+
+ if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nbd-OK $TESTDIR/flag.img; then
+diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
+index 642a748..627b8ca 100755
+--- a/test/TEST-50-MULTINIC/test.sh
++++ b/test/TEST-50-MULTINIC/test.sh
+@@ -23,7 +23,8 @@ run_server() {
+ ${SERIAL:+-serial "$SERIAL"} \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+ chmod 644 -- "$TESTDIR"/server.pid || return 1
+@@ -58,7 +59,8 @@ client_test() {
+ -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "$cmdline $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
++ -no-reboot \
++ -append "panic=1 $cmdline $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
+ -initrd "$TESTDIR"/initramfs.testing
+
+ { read OK; read IFACES; } < "$TESTDIR"/client.img
+diff --git a/test/TEST-60-MTUMAC/test.sh b/test/TEST-60-MTUMAC/test.sh
+index b70e316..f2d5c4a 100755
+--- a/test/TEST-60-MTUMAC/test.sh
++++ b/test/TEST-60-MTUMAC/test.sh
+@@ -22,7 +22,8 @@ run_server() {
+ ${SERIAL:+-serial "$SERIAL"} \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+ chmod 644 -- "$TESTDIR"/server.pid || return 1
+@@ -56,7 +57,8 @@ client_test() {
+ -net nic,macaddr=52:54:00:12:34:05,model=e1000 \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "$cmdline $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
++ -no-reboot \
++ -append "panic=1 $cmdline $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
+ -initrd "$TESTDIR"/initramfs.testing
+
+ {
+diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf
+index ec810c2..e26bd60 100644
+--- a/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf
++++ b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf
+@@ -22,6 +22,6 @@ subnet 192.168.51.0 netmask 255.255.255.0 {
+ option domain-name-servers 192.168.51.1;
+ option domain-search "example.com";
+ option domain-name "other.com";
+- option root-path "nfs:192.168.50.1:/nfs/client";
++ option root-path "nfs:192.168.51.1:/nfs/client";
+ range 192.168.51.10 192.168.51.100;
+ }
+diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+index dcf9d5c..9cf1f1a 100755
+--- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
++++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+@@ -29,7 +29,8 @@ run_server() {
+ ${SERIAL:+-serial "$SERIAL"} \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
++ -no-reboot \
++ -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
+ -initrd "$TESTDIR"/initramfs.server \
+ -pidfile "$TESTDIR"/server.pid -daemonize || return 1
+ chmod 644 -- "$TESTDIR"/server.pid || return 1
+@@ -70,7 +71,8 @@ client_test() {
+ -net nic,vlan=3,macaddr=52:54:00:12:34:05,model=e1000 \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -kernel /boot/vmlinuz-"$KVERSION" \
+- -append "$cmdline rd.info $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
++ -no-reboot \
++ -append "panic=1 $cmdline rd.info $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
+ -initrd "$TESTDIR"/initramfs.testing
+
+ {
diff --git a/SOURCES/0475-TEST-99-RPM-speedup-test.patch b/SOURCES/0475-TEST-99-RPM-speedup-test.patch
new file mode 100644
index 0000000..33f8f7a
--- /dev/null
+++ b/SOURCES/0475-TEST-99-RPM-speedup-test.patch
@@ -0,0 +1,126 @@
+From 968eb46fce41fc1819afd1f0683a61704e35fe54 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 11 Nov 2016 14:08:14 +0100
+Subject: [PATCH] TEST-99-RPM: speedup test
+
+---
+ Makefile | 2 +-
+ test/TEST-99-RPM/test.sh | 38 +++++++++++++++++++++++---------------
+ 2 files changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 18f5a88..9798737 100644
+--- a/Makefile
++++ b/Makefile
+@@ -189,7 +189,7 @@ rpm: dracut-$(VERSION).tar.bz2 syncheck
+ (cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+ --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+ --define "_rpmdir $$PWD" -ba dracut.spec; ) && \
+- ( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr -- "$$rpmbuild"; ls *.rpm )
++ ( mv "$$rpmbuild"/$$(arch)/*.rpm $(DESTDIR).; mv "$$rpmbuild"/*.src.rpm $(DESTDIR).;rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
+
+ syncheck:
+ @ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \
+diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
+index fc68273..17c0bf8 100755
+--- a/test/TEST-99-RPM/test.sh
++++ b/test/TEST-99-RPM/test.sh
+@@ -1,11 +1,14 @@
+ #!/bin/bash
+-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+-# ex: ts=8 sw=4 sts=4 et filetype=sh
++
+ TEST_DESCRIPTION="rpm integrity after dracut and kernel install"
+-$TESTDIR
++
++test_check() {
++ command -v rpm &>/dev/null && ( command -v yum || command -v dnf ) &>/dev/null
++}
+
+ test_run() {
+ set -x
++ set -e
+ export rootdir=$TESTDIR/root
+
+ mkdir -p $rootdir
+@@ -14,33 +17,34 @@ test_run() {
+ mkdir -p "$rootdir/sys"
+ mkdir -p "$rootdir/dev"
+
+-trap 'ret=$?; [[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; }; exit $ret;' EXIT
+-trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; }; exit 1;' SIGINT
++trap 'ret=$?; [[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; } || :; exit $ret;' EXIT
++trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umount "$rootdir/dev"; rm -rf -- "$rootdir"; } || :; exit 1;' SIGINT
+
+ mount --bind /proc "$rootdir/proc"
+ mount --bind /sys "$rootdir/sys"
+ mount -t devtmpfs devtmpfs "$rootdir/dev"
+
+- yum --nogpgcheck --releasever=/ --installroot "$rootdir"/ install -y \
+- yum \
++ dnf_or_yum=yum
++ command -v dnf >/dev/null && dnf_or_yum="dnf --allowerasing"
++ $dnf_or_yum --releasever=7 --nogpgcheck --installroot "$rootdir"/ install -y \
++ $dnf_or_yum \
+ passwd \
+ rootfiles \
+ systemd \
+ kernel \
+- fedora-release \
+ device-mapper-multipath \
+ lvm2 \
+ mdadm \
+ bash \
+ iscsi-initiator-utils \
+- $basedir/dracut-[0-9]*.$(arch).rpm \
+- $basedir/dracut-network-[0-9]*.$(arch).rpm
++ "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \
++ "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm
+
+ cat >"$rootdir"/test.sh <<EOF
+ #!/bin/bash
+ set -x
+ export LC_MESSAGES=C
+-rpm -Va &> /test.output
++rpm -Va |& grep -F -v '85-display-manager.preset' &> /test.output
+ find / -xdev -type f -not -path '/var/*' \
+ -not -path '/usr/lib/modules/*/modules.*' \
+ -not -path '/etc/*-' \
+@@ -51,18 +55,20 @@ find / -xdev -type f -not -path '/var/*' \
+ -not -path '/etc/nsswitch.conf.bak' \
+ -not -path '/etc/iscsi/initiatorname.iscsi' \
+ -not -path '/boot/*0-rescue*' \
++ -not -path '/usr/share/mime/*' \
++ -not -path '/etc/crypto-policies/*' \
+ -not -path '/dev/null' \
+ -not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \
+ -not -path "/boot/\$(cat /etc/machine-id)/*" \
+ -not -path '/etc/openldap/certs/*' \
+- -exec rpm -qf '{}' ';' | \
+- grep -F 'not owned' &> /test.output
+-exit
++ -print0 | xargs -0 rpm -qf | \
++ grep -F 'not owned' &>> /test.output
++exit 0
+ EOF
+
+ chmod 0755 "$rootdir/test.sh"
+
+- chroot "$rootdir" /test.sh
++ chroot "$rootdir" /test.sh || :
+
+ if [[ -s "$rootdir"/test.output ]]; then
+ failed=1
+@@ -80,10 +86,12 @@ EOF
+ }
+
+ test_setup() {
++ make -C "$basedir" DESTDIR="$TESTDIR/" rpm
+ return 0
+ }
+
+ test_cleanup() {
++ rm -fr -- "$TESTDIR"/*.rpm
+ return 0
+ }
+
diff --git a/SOURCES/0476-fips-module-setup.sh-also-blacklist-the-alias-resolv.patch b/SOURCES/0476-fips-module-setup.sh-also-blacklist-the-alias-resolv.patch
new file mode 100644
index 0000000..4c59c87
--- /dev/null
+++ b/SOURCES/0476-fips-module-setup.sh-also-blacklist-the-alias-resolv.patch
@@ -0,0 +1,34 @@
+From 73cf135d804f18b7a1c51ad30004cab9636d2fe8 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 13:54:20 +0100
+Subject: [PATCH] fips/module-setup.sh: also blacklist the alias resolved
+ modules
+
+---
+ modules.d/01fips/module-setup.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index dc47634..3bf6c33 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -11,7 +11,7 @@ depends() {
+ }
+
+ installkernel() {
+- local _fipsmodules _mod
++ local _fipsmodules _mod i
+
+ if [[ -f "${srcmods}/modules.fips" ]]; then
+ _fipsmodules="$(cat "${srcmods}/modules.fips")"
+@@ -30,6 +30,10 @@ installkernel() {
+ if hostonly='' instmods -c -s $_mod; then
+ echo $_mod >> "${initdir}/etc/fipsmodules"
+ echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
++ for i in $(modprobe --resolve-alias $_mod 2>/dev/null); do
++ [[ $i == $_mod ]] && continue
++ echo "blacklist $i" >> "${initdir}/etc/modprobe.d/fips.conf"
++ done
+ fi
+ done
+ }
diff --git a/SOURCES/0477-fips-fips.sh-also-check-for-crypto-mod-in-proc-crypt.patch b/SOURCES/0477-fips-fips.sh-also-check-for-crypto-mod-in-proc-crypt.patch
new file mode 100644
index 0000000..3e035e4
--- /dev/null
+++ b/SOURCES/0477-fips-fips.sh-also-check-for-crypto-mod-in-proc-crypt.patch
@@ -0,0 +1,24 @@
+From 455f87f41f808e97c243585691e615bc1a487013 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 13:54:49 +0100
+Subject: [PATCH] fips/fips.sh: also check for crypto-$mod in /proc/crypto
+
+if the module name is the alias crypto-<algo>, check if <algo> is in
+/proc/crypto as "name : <algo>" or "driver: <algo>"
+---
+ modules.d/01fips/fips.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index 7fa48f1..0b69a82 100755
+--- a/modules.d/01fips/fips.sh
++++ b/modules.d/01fips/fips.sh
+@@ -96,7 +96,7 @@ do_fips()
+ _found=0
+ while read _k _s _v; do
+ [ "$_k" != "name" -a "$_k" != "driver" ] && continue
+- [ "$_v" != "$_module" ] && continue
++ [ "$_v" != "$_module" ] && [ "crypto-$_v" != "$_module" ] && continue
+ _found=1
+ break
+ done </proc/crypto
diff --git a/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch
new file mode 100644
index 0000000..a25a238
--- /dev/null
+++ b/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch
@@ -0,0 +1,19 @@
+From 11366030aab04d48b9dc14ad46a6598c5fb4598a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 14:01:03 +0100
+Subject: [PATCH] README.md: correct CentOS build job link
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 9617eaf..8bfda44 100644
+--- a/README.md
++++ b/README.md
+@@ -2,4 +2,4 @@
+
+ dracut is an initramfs infrastructure.
+
+-CentOS CI Status: [](https://ci.centos.org/job/dracut-pr-build/)
++CentOS CI Status: [](https://ci.centos.org/job/dracut-matrix-master/)
diff --git a/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch
new file mode 100644
index 0000000..e0b210c
--- /dev/null
+++ b/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch
@@ -0,0 +1,19 @@
+From d381343caac54ec48d9757bb7bd66956fd4fdbd7 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 14:06:58 +0100
+Subject: [PATCH] README.md: correct CentOS build job link
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 8bfda44..9cfccae 100644
+--- a/README.md
++++ b/README.md
+@@ -2,4 +2,4 @@
+
+ dracut is an initramfs infrastructure.
+
+-CentOS CI Status: [](https://ci.centos.org/job/dracut-matrix-master/)
++CentOS CI Status: [](https://ci.centos.org/job/dracut-push-master/)
diff --git a/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch
new file mode 100644
index 0000000..5d1b31f
--- /dev/null
+++ b/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch
@@ -0,0 +1,19 @@
+From 5fd8d273832132635bf48fad7ae7694025590b22 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 14:15:37 +0100
+Subject: [PATCH] README.md: correct CentOS build job link
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 9cfccae..2f88ff7 100644
+--- a/README.md
++++ b/README.md
+@@ -2,4 +2,4 @@
+
+ dracut is an initramfs infrastructure.
+
+-CentOS CI Status: [](https://ci.centos.org/job/dracut-push-master/)
++CentOS CI Status: [](https://ci.centos.org/job/dracut-push-rhel-7/)
diff --git a/SOURCES/0481-fips-module-setup.sh-make-tcrypt-non-optional.patch b/SOURCES/0481-fips-module-setup.sh-make-tcrypt-non-optional.patch
new file mode 100644
index 0000000..ed873a0
--- /dev/null
+++ b/SOURCES/0481-fips-module-setup.sh-make-tcrypt-non-optional.patch
@@ -0,0 +1,28 @@
+From 1bb76cea727468cf2c1a05814b93a83711be3ee9 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Nov 2016 15:01:39 +0100
+Subject: [PATCH] fips/module-setup.sh: make tcrypt non-optional
+
+---
+ modules.d/01fips/module-setup.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 3bf6c33..d553a8c 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -21,12 +21,12 @@ installkernel() {
+ _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+ _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+ _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390 "
+- _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib "
++ _fipsmodules+="sha384 sha512 sha512_generic tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib "
+ fi
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+
+- for _mod in $_fipsmodules; do
++ for _mod in $_fipsmodules tcrypt; do
+ if hostonly='' instmods -c -s $_mod; then
+ echo $_mod >> "${initdir}/etc/fipsmodules"
+ echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
diff --git a/SOURCES/0482-dracut.sh-skip-empty-lines-in-proc-modules.patch b/SOURCES/0482-dracut.sh-skip-empty-lines-in-proc-modules.patch
new file mode 100644
index 0000000..67c5bb6
--- /dev/null
+++ b/SOURCES/0482-dracut.sh-skip-empty-lines-in-proc-modules.patch
@@ -0,0 +1,22 @@
+From b120b0c116591c80503404cd4d2f630508ce9b34 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 11 Jan 2017 13:40:13 +0100
+Subject: [PATCH] dracut.sh: skip empty lines in /proc/modules
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1405025
+---
+ dracut.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dracut.sh b/dracut.sh
+index 90ea9c3..e45dc7b 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1132,6 +1132,7 @@ if [[ $hostonly ]]; then
+ # check /proc/modules
+ declare -A host_modules
+ while read m rest; do
++ [ -z "$m" ] && continue
+ host_modules["$m"]=1
+ done </proc/modules
+ fi
diff --git a/SOURCES/0483-dracut.conf.5.asc-add-Warning-about-leading-and-trai.patch b/SOURCES/0483-dracut.conf.5.asc-add-Warning-about-leading-and-trai.patch
new file mode 100644
index 0000000..7b8e28c
--- /dev/null
+++ b/SOURCES/0483-dracut.conf.5.asc-add-Warning-about-leading-and-trai.patch
@@ -0,0 +1,26 @@
+From fa861e2cbff8cde4fd55437f63f29d2b38c57d09 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 11 Jan 2017 13:47:24 +0100
+Subject: [PATCH] dracut.conf.5.asc: add Warning about leading and trailing
+ spaces in lists
+
+---
+ dracut.conf.5.asc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
+index c20a341..f4ad49d 100644
+--- a/dracut.conf.5.asc
++++ b/dracut.conf.5.asc
+@@ -30,6 +30,11 @@ dracut command line options will overwrite any values set here.
+
+ Configuration files must have the extension .conf; other extensions are ignored.
+
++[WARNING]
++====
++Space-separated lists have to have a leading and trailing space!
++====
++
+ *dracutmodules+=*" __<dracut modules>__ "::
+ Specify a space-separated list of dracut modules to call when building the
+ initramfs. Modules are located in _/usr/lib/dracut/modules.d_.
diff --git a/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch b/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch
new file mode 100644
index 0000000..2e20472
--- /dev/null
+++ b/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch
@@ -0,0 +1,24 @@
+From 72ae0fd418680b7e4931ce760efdfea455740ccb Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 12 Aug 2016 11:24:47 +0200
+Subject: [PATCH] systemd/dracut-cmdline.sh: unset "UNSET" $root
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1365667
+caused by commit 9aa224cc
+---
+ modules.d/98systemd/dracut-cmdline.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh
+index 17b30a3..630f3f9 100755
+--- a/modules.d/98systemd/dracut-cmdline.sh
++++ b/modules.d/98systemd/dracut-cmdline.sh
+@@ -79,6 +79,8 @@ esac
+ [ -z "${root}${root_unset}" ] && die "Empty root= argument"
+ [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
+
++[ "$root" = "UNSET" ] && unset root
++
+ export root rflags fstype netroot NEWROOT
+
+ export -p > /dracut-state.sh
diff --git a/SOURCES/0485-add-dracut.pc-pkg-config-file.patch b/SOURCES/0485-add-dracut.pc-pkg-config-file.patch
new file mode 100644
index 0000000..3828abc
--- /dev/null
+++ b/SOURCES/0485-add-dracut.pc-pkg-config-file.patch
@@ -0,0 +1,69 @@
+From d971a570d091a77c765c996a2c470a7d9fddd0b1 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 13 May 2015 11:46:05 +0200
+Subject: [PATCH] add dracut.pc pkg-config file
+
+---
+ Makefile | 15 +++++++++++++--
+ dracut.spec | 1 +
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9798737..2977d18 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,6 +15,7 @@ mandir ?= ${prefix}/share/man
+ CFLAGS ?= -O2 -g -Wall
+ CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64
+ bashcompletiondir ?= ${datadir}/bash-completion/completions
++pkgconfigdatadir ?= $(datadir)/pkgconfig
+
+ man1pages = lsinitrd.1
+
+@@ -40,7 +41,7 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
+
+ .PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
+
+-all: dracut-version.sh dracut-install skipcpio/skipcpio
++all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio
+
+ DRACUT_INSTALL_OBJECTS = \
+ install/dracut-install.o \
+@@ -93,7 +94,15 @@ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
+ rm -f -- dracut.xml
+
+-install: dracut-version.sh
++dracut.pc: Makefile.inc Makefile
++ @echo "Name: dracut" > dracut.pc
++ @echo "Description: dracut" >> dracut.pc
++ @echo "Version: $(VERSION)$(GITVERSION)" >> dracut.pc
++ @echo "dracutdir=$(pkglibdir)" >> dracut.pc
++ @echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
++ @echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
++
++install: all
+ mkdir -p $(DESTDIR)$(pkglibdir)
+ mkdir -p $(DESTDIR)$(bindir)
+ mkdir -p $(DESTDIR)$(sysconfdir)
+@@ -153,6 +162,8 @@ endif
+ mkdir -p $(DESTDIR)${bashcompletiondir}
+ install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
+ install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
++ mkdir -p $(DESTDIR)${pkgconfigdatadir}
++ install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
+
+ dracut-version.sh:
+ @echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh
+diff --git a/dracut.spec b/dracut.spec
+index efb50b7..bf10d08 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -312,6 +312,7 @@ rm -rf -- $RPM_BUILD_ROOT
+ %endif
+ %dir %{_sysconfdir}/dracut.conf.d
+ %dir %{dracutlibdir}/dracut.conf.d
++%{_datadir}/pkgconfig/dracut.pc
+ %{_mandir}/man8/dracut.8*
+ %{_mandir}/man8/*service.8*
+ %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
diff --git a/SOURCES/0486-dracut.sh-fail-hard-if-we-find-modules-and-modules.d.patch b/SOURCES/0486-dracut.sh-fail-hard-if-we-find-modules-and-modules.d.patch
new file mode 100644
index 0000000..ffb4b2c
--- /dev/null
+++ b/SOURCES/0486-dracut.sh-fail-hard-if-we-find-modules-and-modules.d.patch
@@ -0,0 +1,34 @@
+From 9301650e17a24194b0a4f78d8f91b87ef62d46dc Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 13 Jan 2016 09:32:24 +0100
+Subject: [PATCH] dracut.sh: fail hard, if we find modules and modules.dep is
+ missing
+
+If modules are present in /lib/modules/<kernelversion> and modules.dep
+is empty, depmod was not run most likely.
+---
+ dracut.sh | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index e45dc7b..f4e8509 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -969,9 +969,14 @@ esac
+ abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
+
+ if [[ -d $srcmods ]]; then
+- [[ -f $srcmods/modules.dep ]] || {
+- dwarn "$srcmods/modules.dep is missing. Did you run depmod?"
+- }
++ if ! [[ -f $srcmods/modules.dep ]]; then
++ if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
++ dfatal "$srcmods/modules.dep is missing. Did you run depmod?"
++ exit 1
++ else
++ dwarn "$srcmods/modules.dep is missing. Did you run depmod?"
++ fi
++ fi
+ fi
+
+ if [[ ! $print_cmdline ]]; then
diff --git a/SOURCES/0487-99base-add-memtrace-ko.sh-to-debug-kernel-module-lar.patch b/SOURCES/0487-99base-add-memtrace-ko.sh-to-debug-kernel-module-lar.patch
new file mode 100644
index 0000000..461f29d
--- /dev/null
+++ b/SOURCES/0487-99base-add-memtrace-ko.sh-to-debug-kernel-module-lar.patch
@@ -0,0 +1,275 @@
+From 3ce2235abbd28cefcef348ad7895e2529810ad7c Mon Sep 17 00:00:00 2001
+From: Xunlei Pang <xlpang@redhat.com>
+Date: Thu, 3 Nov 2016 19:30:41 +0800
+Subject: [PATCH] 99base: add memtrace-ko.sh to debug kernel module large
+ memory consumption
+
+The current method for memory debug is to use "rd.memdebug=[0-3]",
+it is not enough for debugging kernel modules. For example, when we
+want to find out which kernel module consumes a large amount of memory,
+"rd.memdebug=[0-3]" won't help too much.
+
+A better way is needed to achieve this requirement, this is useful for
+kdump OOM debugging.
+
+The principle of this patch is to use kernel trace to track slab and
+buddy allocation calls during kernel module loading(module_init), thus
+we can analyze all the trace data and get the total memory consumption.
+As for large slab allocation, it will probably fall into buddy allocation,
+thus tracing "mm_page_alloc" alone should be enough for the purpose(this
+saves quite some trace buffer memory, also large free is quite unlikey
+during module loading, we neglect those memory free events).
+
+The trace events include memory calls under "tracing/events/":
+ kmem/mm_page_alloc
+
+We also inpect the following events to detect the module loading:
+ module/module_load
+ module/module_put
+
+Since we use filters to trace events, the final trace data size won't
+be too big. Users can adjust the trace buffer size via "trace_buf_size"
+kernel boot command line as needed.
+
+We can get the module name and task pid from "module_load" event which
+also mark the beginning of the loading, and module_put called by the
+same task pid implies the end of the loading. So the memory events
+recorded in between by the same task pid are consumed by this module
+during loading(i.e. modprobe or module_init()).
+
+With these information, we can record the rough total memory(the larger,
+the more precise the result will be) consumption involved by each kernel
+module loading.
+
+Thus we introduce this shell script to find out which kernel module
+consumes a large amount of memory during loading. Use "rd.memdebug=4"
+as the tigger.
+
+After applying this patch and specifying "rd.memdebug=4", during booting
+it will print out something extra like below:
+0 pages consumed by "pata_acpi"
+0 pages consumed by "ata_generic"
+1 pages consumed by "drm"
+0 pages consumed by "ttm"
+0 pages consumed by "drm_kms_helper"
+835 pages consumed by "qxl"
+0 pages consumed by "mii"
+6 pages consumed by "8139cp"
+0 pages consumed by "virtio"
+0 pages consumed by "virtio_ring"
+9 pages consumed by "virtio_pci"
+1 pages consumed by "8139too"
+0 pages consumed by "serio_raw"
+0 pages consumed by "crc32c_intel"
+199 pages consumed by "virtio_console"
+0 pages consumed by "libcrc32c"
+9 pages consumed by "xfs"
+
+From the print, we see clearly that "qxl" consumed the most memory.
+
+This file will be installed as a separate executable named "tracekomem"
+in the following patch.
+
+Signed-off-by: Xunlei Pang <xlpang@redhat.com>
+---
+ modules.d/99base/memtrace-ko.sh | 191 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 191 insertions(+)
+ create mode 100755 modules.d/99base/memtrace-ko.sh
+
+diff --git a/modules.d/99base/memtrace-ko.sh b/modules.d/99base/memtrace-ko.sh
+new file mode 100755
+index 0000000..ee035e1
+--- /dev/null
++++ b/modules.d/99base/memtrace-ko.sh
+@@ -0,0 +1,191 @@
++#!/bin/sh
++
++# Try to find out kernel modules with large total memory allocation during loading.
++# For large slab allocation, it will fall into buddy, also not trace "mm_page_free"
++# considering large free is quite rare for module_init, thus saving tons of events
++# to avoid trace data overwritten.
++#
++# Therefore, tracing "mm_page_alloc"alone should be enough for the purpose.
++
++# "sys/kernel/tracing" has the priority if exists.
++get_trace_base() {
++ # trace access through debugfs would be obsolete if "/sys/kernel/tracing" is available.
++ if [ -d "/sys/kernel/tracing" ]; then
++ echo "/sys/kernel"
++ else
++ echo "/sys/kernel/debug"
++ fi
++}
++
++# We want to enable these trace events.
++get_want_events() {
++ echo "module:module_put module:module_load kmem:mm_page_alloc"
++}
++
++get_event_filter() {
++ echo "comm == systemd-udevd || comm == modprobe || comm == insmod"
++}
++
++is_trace_ready() {
++ local trace_base want_events current_events
++
++ trace_base=$(get_trace_base)
++ ! [ -f "$trace_base/tracing/trace" ] && return 1
++
++ [ "$(cat $trace_base/tracing/tracing_on)" -eq 0 ] && return 1
++
++ # Also check if trace events were properly setup.
++ want_events=$(get_want_events)
++ current_events=$(echo $(cat $trace_base/tracing/set_event))
++ [ "$current_events" != "$want_events" ] && return 1
++
++ return 0
++}
++
++prepare_trace() {
++ local trace_base
++
++ trace_base=$(get_trace_base)
++ # old debugfs interface case.
++ if ! [ -d "$trace_base/tracing" ]; then
++ mount none -t debugfs $trace_base
++ # new tracefs interface case.
++ elif ! [ -f "$trace_base/tracing/trace" ]; then
++ mount none -t tracefs "$trace_base/tracing"
++ fi
++
++ if ! [ -f "$trace_base/tracing/trace" ]; then
++ echo "WARN: Mount trace failed for kernel module memory analyzing."
++ return 1
++ fi
++
++ # Active all the wanted trace events.
++ echo "$(get_want_events)" > $trace_base/tracing/set_event
++
++ # There are three kinds of known applications for module loading:
++ # "systemd-udevd", "modprobe" and "insmod".
++ # Set them as the global events filter.
++ # NOTE: Some kernel may not support this format of filter, anyway
++ # the operation will fail and it doesn't matter.
++ echo "$(get_event_filter)" > $trace_base/tracing/events/kmem/filter 2>&1
++ echo "$(get_event_filter)" > $trace_base/tracing/events/module/filter 2>&1
++
++ # Set the number of comm-pid if supported.
++ if [ -f "$trace_base/tracing/saved_cmdlines_size" ]; then
++ # Thanks to filters, 4096 is big enough(also well supported).
++ echo 4096 > $trace_base/tracing/saved_cmdlines_size
++ fi
++
++ # Enable and clear trace data for the first time.
++ echo 1 > $trace_base/tracing/tracing_on
++ echo > $trace_base/tracing/trace
++ echo "Prepare trace success."
++ return 0
++}
++
++order_to_pages()
++{
++ local pages=1
++ local order=$1
++
++ while [ "$order" != 0 ]; do
++ order=$((order-1))
++ pages=$(($pages*2))
++ done
++
++ echo $pages
++}
++
++parse_trace_data() {
++ local module_name tmp_eval pages
++
++ cat "$(get_trace_base)/tracing/trace" | while read pid cpu flags ts function args
++ do
++ # Skip comment lines
++ if [ "$pid" = "#" ]; then
++ continue
++ fi
++
++ pid=${pid##*-}
++ function=${function%:}
++ if [ "$function" = "module_load" ]; then
++ # One module is being loaded, save the task pid for tracking.
++ # Remove the trailing after whitespace, there may be the module flags.
++ module_name=${args%% *}
++ # Mark current_module to track the task.
++ eval current_module_$pid="$module_name"
++ tmp_eval=$(eval echo '${module_loaded_'${module_name}'}')
++ if [ -n "$tmp_eval" ]; then
++ echo "WARN: \"$module_name\" was loaded multiple times!"
++ fi
++ eval unset module_loaded_$module_name
++ eval nr_alloc_pages_$module_name=0
++ continue
++ fi
++
++ module_name=$(eval echo '${current_module_'${pid}'}')
++ if [ -z "$module_name" ]; then
++ continue
++ fi
++
++ # Once we get here, the task is being tracked(is loading a module).
++ if [ "$function" = "module_put" ]; then
++ # Mark the module as loaded when the first module_put event happens after module_load.
++ tmp_eval=$(eval echo '${nr_alloc_pages_'${module_name}'}')
++ echo "$tmp_eval pages consumed by \"$module_name\""
++ eval module_loaded_$module_name=1
++ # Module loading finished, so untrack the task.
++ eval unset current_module_$pid
++ eval unset nr_alloc_pages_$module_name
++ continue
++ fi
++
++ if [ "$function" = "mm_page_alloc" ]; then
++ # Get order first, then convert to actual pages.
++ pages=$(echo $args | sed -e 's/.*order=\([0-9]*\) .*/\1/')
++ pages=$(order_to_pages "$pages")
++ tmp_eval=$(eval echo '${nr_alloc_pages_'${module_name}'}')
++ eval nr_alloc_pages_$module_name="$(($tmp_eval+$pages))"
++ fi
++ done
++}
++
++cleanup_trace() {
++ local trace_base
++
++ if is_trace_ready; then
++ trace_base=$(get_trace_base)
++ echo 0 > $trace_base/tracing/tracing_on
++ echo > $trace_base/tracing/trace
++ echo > $trace_base/tracing/set_event
++ echo 0 > $trace_base/tracing/events/kmem/filter
++ echo 0 > $trace_base/tracing/events/module/filter
++ fi
++}
++
++show_usage() {
++ echo "Find out kernel modules with large memory consumption during loading based on trace."
++ echo "Usage:"
++ echo "1) run it first to setup trace."
++ echo "2) run again to parse the trace data if any."
++ echo "3) run with \"--cleanup\" option to cleanup trace after use."
++}
++
++if [ "$1" = "--help" ]; then
++ show_usage
++ exit 0
++fi
++
++if [ "$1" = "--cleanup" ]; then
++ cleanup_trace
++ exit 0
++fi
++
++if is_trace_ready ; then
++ echo "tracekomem - Rough memory consumption by loading kernel modules (larger value with better accuracy)"
++ parse_trace_data
++else
++ prepare_trace
++fi
++
++exit $?
diff --git a/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch b/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch
new file mode 100644
index 0000000..b0b220b
--- /dev/null
+++ b/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch
@@ -0,0 +1,169 @@
+From e186d99780d1247f24535e5dc4ec9c82444afaa3 Mon Sep 17 00:00:00 2001
+From: Xunlei Pang <xlpang@redhat.com>
+Date: Thu, 3 Nov 2016 19:40:16 +0800
+Subject: [PATCH] 99base: apply kernel module memory debug support
+
+Extend "rd.memdebug" to "4", and "make_trace_mem" to "4+:komem".
+Add new "cleanup_trace_mem" to cleanup the trace if active.
+
+Signed-off-by: Xunlei Pang <xlpang@redhat.com>
+---
+ modules.d/98systemd/dracut-cmdline.sh | 2 +-
+ modules.d/98systemd/dracut-pre-mount.sh | 2 +-
+ modules.d/98systemd/dracut-pre-pivot.sh | 3 ++-
+ modules.d/98systemd/dracut-pre-trigger.sh | 2 +-
+ modules.d/99base/dracut-lib.sh | 13 ++++++++++++-
+ modules.d/99base/init.sh | 9 +++++----
+ modules.d/99base/module-setup.sh | 1 +
+ 7 files changed, 23 insertions(+), 9 deletions(-)
+
+diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh
+index 630f3f9..b6b899f 100755
+--- a/modules.d/98systemd/dracut-cmdline.sh
++++ b/modules.d/98systemd/dracut-cmdline.sh
+@@ -43,7 +43,7 @@ export root
+ export rflags
+ export fstype
+
+-make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab'
++make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' '4+:komem'
+ # run scriptlets to parse the command line
+ getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
+ source_hook cmdline
+diff --git a/modules.d/98systemd/dracut-pre-mount.sh b/modules.d/98systemd/dracut-pre-mount.sh
+index 55b051a..199cf96 100755
+--- a/modules.d/98systemd/dracut-pre-mount.sh
++++ b/modules.d/98systemd/dracut-pre-mount.sh
+@@ -9,7 +9,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+ source_conf /etc/conf.d
+
+-make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab'
++make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+ # pre pivot scripts are sourced just before we doing cleanup and switch over
+ # to the new root.
+ getarg 'rd.break=pre-mount' 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"
+diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
+index 4c3eefc..c079972 100755
+--- a/modules.d/98systemd/dracut-pre-pivot.sh
++++ b/modules.d/98systemd/dracut-pre-pivot.sh
+@@ -10,12 +10,13 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+ source_conf /etc/conf.d
+
+-make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
++make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+ # pre pivot scripts are sourced just before we doing cleanup and switch over
+ # to the new root.
+ getarg 'rd.break=pre-pivot' 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
+ source_hook pre-pivot
+
++cleanup_trace_mem
+ # pre pivot cleanup scripts are sourced just before we switch over to the new root.
+ getarg 'rd.break=cleanup' 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
+ source_hook cleanup
+diff --git a/modules.d/98systemd/dracut-pre-trigger.sh b/modules.d/98systemd/dracut-pre-trigger.sh
+index 0dbf32a..241cd1e 100755
+--- a/modules.d/98systemd/dracut-pre-trigger.sh
++++ b/modules.d/98systemd/dracut-pre-trigger.sh
+@@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+ source_conf /etc/conf.d
+
+-make_trace_mem "hook pre-trigger" "1:shortmem" "2+:mem" "3+:slab"
++make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+
+ source_hook pre-trigger
+
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index 10d9cbc..78e01a7 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -1177,12 +1177,20 @@ are_lists_eq() {
+
+ setmemdebug() {
+ if [ -z "$DEBUG_MEM_LEVEL" ]; then
+- export DEBUG_MEM_LEVEL=$(getargnum 0 0 3 rd.memdebug)
++ export DEBUG_MEM_LEVEL=$(getargnum 0 0 4 rd.memdebug)
+ fi
+ }
+
+ setmemdebug
+
++cleanup_trace_mem()
++{
++ # tracekomem based on kernel trace needs cleanup after use.
++ if [ "$DEBUG_MEM_LEVEL" -eq 4 ]; then
++ tracekomem --cleanup
++ fi
++}
++
+ # parameters: msg [trace_level:trace]...
+ make_trace_mem()
+ {
+@@ -1267,5 +1275,8 @@ show_memstats()
+ iomem)
+ cat /proc/iomem
+ ;;
++ komem)
++ tracekomem
++ ;;
+ esac
+ }
+diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
+index 7bbe670..473bf42 100755
+--- a/modules.d/99base/init.sh
++++ b/modules.d/99base/init.sh
+@@ -124,7 +124,7 @@ if getarg "rd.cmdline=ask"; then
+ fi
+
+ # run scriptlets to parse the command line
+-make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab'
++make_trace_mem "hook cmdline" '1+:mem' '1+:iomem' '3+:slab' '4+:komem'
+ getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
+ source_hook cmdline
+
+@@ -153,7 +153,7 @@ getargbool 0 rd.udev.info -d -y rdudevinfo && udevadm control "$UDEV_LOG_PRIO_AR
+ getargbool 0 rd.udev.debug -d -y rdudevdebug && udevadm control "$UDEV_LOG_PRIO_ARG=debug"
+ udevproperty "hookdir=$hookdir"
+
+-make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab'
++make_trace_mem "hook pre-trigger" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+ getarg 'rd.break=pre-trigger' -d 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre-trigger"
+ source_hook pre-trigger
+
+@@ -224,7 +224,7 @@ unset RDRETRY
+
+ # pre-mount happens before we try to mount the root filesystem,
+ # and happens once.
+-make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab'
++make_trace_mem "hook pre-mount" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+ getarg 'rd.break=pre-mount' -d 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"
+ source_hook pre-mount
+
+@@ -260,11 +260,12 @@ done
+
+ # pre pivot scripts are sourced just before we doing cleanup and switch over
+ # to the new root.
+-make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab'
++make_trace_mem "hook pre-pivot" '1:shortmem' '2+:mem' '3+:slab' '4+:komem'
+ getarg 'rd.break=pre-pivot' -d 'rdbreak=pre-pivot' && emergency_shell -n pre-pivot "Break pre-pivot"
+ source_hook pre-pivot
+
+ make_trace_mem "hook cleanup" '1:shortmem' '2+:mem' '3+:slab'
++cleanup_trace_mem
+ # pre pivot cleanup scripts are sourced just before we switch over to the new root.
+ getarg 'rd.break=cleanup' -d 'rdbreak=cleanup' && emergency_shell -n cleanup "Break cleanup"
+ source_hook cleanup
+diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
+index d5e7861..8fd4e80 100755
+--- a/modules.d/99base/module-setup.sh
++++ b/modules.d/99base/module-setup.sh
+@@ -34,6 +34,7 @@ install() {
+ inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
+ inst_script "$moddir/loginit.sh" "/sbin/loginit"
+ inst_script "$moddir/rdsosreport.sh" "/sbin/rdsosreport"
++ inst_script "$moddir/memtrace-ko.sh" "/sbin/tracekomem"
+
+ [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
+ mkdir -m 0755 -p ${initdir}/lib/dracut
diff --git a/SOURCES/0489-dracut.cmdline.7.asc-update-document-for-rd.memdebug.patch b/SOURCES/0489-dracut.cmdline.7.asc-update-document-for-rd.memdebug.patch
new file mode 100644
index 0000000..71cc7ae
--- /dev/null
+++ b/SOURCES/0489-dracut.cmdline.7.asc-update-document-for-rd.memdebug.patch
@@ -0,0 +1,38 @@
+From 01e66d43d84a9df9aa5de78a203b4c32e0fa98ec Mon Sep 17 00:00:00 2001
+From: Xunlei Pang <xlpang@redhat.com>
+Date: Fri, 25 Nov 2016 14:55:43 +0800
+Subject: [PATCH] dracut.cmdline.7.asc: update document for rd.memdebug=4
+
+"rd.memdebug=4" is for kernel module memory consumption debugging.
+
+Signed-off-by: Xunlei Pang <xlpang@redhat.com>
+---
+ dracut.cmdline.7.asc | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
+index b479fa8..1626638 100644
+--- a/dracut.cmdline.7.asc
++++ b/dracut.cmdline.7.asc
+@@ -161,8 +161,8 @@ It should be attached to any report about dracut problems.
+ _/run/initramfs/init.log_.
+ If "quiet" is set, it also logs to the console.
+
+-**rd.memdebug=[0-3]**::
+- Print memory usage info at various points, set the verbose level from 0 to 3.
++**rd.memdebug=[0-4]**::
++ Print memory usage info at various points, set the verbose level from 0 to 4.
+ +
+ Higher level means more debugging output:
+ +
+@@ -171,6 +171,10 @@ It should be attached to any report about dracut problems.
+ 1 - partial /proc/meminfo
+ 2 - /proc/meminfo
+ 3 - /proc/meminfo + /proc/slabinfo
++ 4 - /proc/meminfo + /proc/slabinfo + tracekomem
++ NOTE: tracekomem is a shell script utilizing kernel trace to track
++ the rough total memory consumption of kernel modules during
++ loading. It may override other trace configurations.
+ ----
+
+ **rd.break**::
diff --git a/SOURCES/0490-testsuite-add-rd.memdebug-4-in-TEST-01-BASIC-to-test.patch b/SOURCES/0490-testsuite-add-rd.memdebug-4-in-TEST-01-BASIC-to-test.patch
new file mode 100644
index 0000000..91a8071
--- /dev/null
+++ b/SOURCES/0490-testsuite-add-rd.memdebug-4-in-TEST-01-BASIC-to-test.patch
@@ -0,0 +1,27 @@
+From 414834306b69df65ba22bc6f8a3b4fd4a25bf4e4 Mon Sep 17 00:00:00 2001
+From: Xunlei Pang <xlpang@redhat.com>
+Date: Sun, 27 Nov 2016 12:19:41 +0800
+Subject: [PATCH] testsuite: add "rd.memdebug=4" in TEST-01-BASIC to test
+ rd.memdebug
+
+"rd.memdebug=4" includes all the test level, so add it to test
+rd.memdebug function.
+
+Signed-off-by: Xunlei Pang <xlpang@redhat.com>
+---
+ test/TEST-01-BASIC/test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index 6b79dee..0ef7e10 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -15,7 +15,7 @@ test_run() {
+ -net none -kernel /boot/vmlinuz-$KVERSION \
+ -watchdog i6300esb -watchdog-action poweroff \
+ -no-reboot \
+- -append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL" \
++ -append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL rd.memdebug=4" \
+ -initrd $TESTDIR/initramfs.testing || return 1
+ grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
+ }
diff --git a/SOURCES/0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch b/SOURCES/0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch
new file mode 100644
index 0000000..7513ca1
--- /dev/null
+++ b/SOURCES/0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch
@@ -0,0 +1,23 @@
+From 2877acadc0be3dff39c3a92650bacfac7e0603de Mon Sep 17 00:00:00 2001
+From: Lidong Zhong <lzhong@suse.com>
+Date: Mon, 24 Aug 2015 18:02:10 +0800
+Subject: [PATCH] dracut-functions.sh: remove duplicate declaratio of local
+ variable
+
+---
+ dracut-functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 61726e4..3c4118a 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -426,7 +426,7 @@ shorten_persistent_dev() {
+ # $ find_block_device /usr
+ # 8:4
+ find_block_device() {
+- local _majmin _dev _majmin _find_mpt
++ local _dev _majmin _find_mpt
+ _find_mpt="$1"
+ if [[ $use_fstab != yes ]]; then
+ [[ -d $_find_mpt/. ]]
diff --git a/SOURCES/0493-write-ifcfg-do-t-write-MTU-twice-for-regular-eth-dev.patch b/SOURCES/0493-write-ifcfg-do-t-write-MTU-twice-for-regular-eth-dev.patch
new file mode 100644
index 0000000..368750a
--- /dev/null
+++ b/SOURCES/0493-write-ifcfg-do-t-write-MTU-twice-for-regular-eth-dev.patch
@@ -0,0 +1,28 @@
+From 3186abd76ef732f2aeec4f3901d0b6a17a701f3a Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Wed, 1 Mar 2017 14:43:53 +0100
+Subject: [PATCH] write-ifcfg: do't write MTU twice for regular eth devices
+
+If MTU is specified, we write it for every type of device in the
+beginning. There is not point writing it again for Type=ethernet
+devices.
+---
+ modules.d/45ifcfg/write-ifcfg.sh | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
+index a077da1..fa395b3 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
++++ b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -210,10 +210,7 @@ for netup in /tmp/net.*.did-setup ; do
+ # bridge needs different things written to ifcfg
+ if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ] && [ -z "$team" ]; then
+ # standard interface
+- {
+- echo "TYPE=Ethernet"
+- [ -n "$mtu" ] && echo "MTU=\"$mtu\""
+- } >> /tmp/ifcfg/ifcfg-$netif
++ echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$netif
+ fi
+
+ if [ -n "$vlan" ] ; then
diff --git a/SOURCES/0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch b/SOURCES/0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch
new file mode 100644
index 0000000..69d4203
--- /dev/null
+++ b/SOURCES/0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch
@@ -0,0 +1,45 @@
+From 5ae8333947bb6a71232fbb99c626e08f177178e2 Mon Sep 17 00:00:00 2001
+From: Tong Li <tonli@redhat.com>
+Date: Wed, 30 Nov 2016 17:05:57 +0800
+Subject: [PATCH] 95ssh-client: attempt to copy UserKnownHostsFile to kdump's
+ initramfs
+
+Bug related to this issue: https://bugzilla.redhat.com/show_bug.cgi?id=1360131
+Now dracut only attempts to copy GlobalKnownHostsFile while generating kdump's
+initramfs. This method will cause kdump's failure if users set customized
+UserKnownHostsFile in /etc/ssh/ssh_config. This patch simply attempts to copy
+those files too while going through /etc/ssh/ssh_config. Note that we need to
+make sure ~/foo will be copied as /root/foo in kdump's initramfs.
+
+Cherry-picked from: 32f5af2f5e20ee982745262c444c50b20bfb4c01
+Resolves: #1360131
+---
+ modules.d/95ssh-client/module-setup.sh | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh
+index 6b44107..743de98 100755
+--- a/modules.d/95ssh-client/module-setup.sh
++++ b/modules.d/95ssh-client/module-setup.sh
+@@ -44,10 +44,17 @@ inst_sshenv()
+ if [[ -f /etc/ssh/ssh_config ]]; then
+ inst_simple /etc/ssh/ssh_config
+ sed -i -e 's/\(^[[:space:]]*\)ProxyCommand/\1# ProxyCommand/' ${initdir}/etc/ssh/ssh_config
+- while read key val; do
+- [[ $key != "GlobalKnownHostsFile" ]] && continue
+- inst_simple "$val"
+- break
++ while read key val || [ -n "$key" ]; do
++ if [[ $key == "GlobalKnownHostsFile" ]]; then
++ inst_simple "$val"
++ # Copy customized UserKnowHostsFile
++ elif [[ $key == "UserKnownHostsFile" ]]; then
++ # Make sure that ~/foo will be copied as /root/foo in kdump's initramfs
++ if str_starts "$val" "~/"; then
++ val="/root/${val#"~/"}"
++ fi
++ inst_simple "$val"
++ fi
+ done < /etc/ssh/ssh_config
+ fi
+
diff --git a/SOURCES/0496-udev-rules-pull-in-40-redhat-cpu-hotplug.rules.patch b/SOURCES/0496-udev-rules-pull-in-40-redhat-cpu-hotplug.rules.patch
new file mode 100644
index 0000000..ff630f3
--- /dev/null
+++ b/SOURCES/0496-udev-rules-pull-in-40-redhat-cpu-hotplug.rules.patch
@@ -0,0 +1,27 @@
+From 02d0d0a20873a9e42e30113f3e31bce011793f30 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 12 Jun 2017 14:47:06 +0200
+Subject: [PATCH] udev-rules: pull in 40-redhat-cpu-hotplug.rules
+
+Cpu hotplug policy was split off to separate file. Let's pull in the new
+rules file by default.
+
+See: https://bugzilla.redhat.com/show_bug.cgi?id=1266322
+
+Resolves: #1460707
+---
+ modules.d/95udev-rules/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index e0f2e38..13cafc2 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -27,6 +27,7 @@ install() {
+ fi
+
+ inst_rules \
++ 40-redhat-cpu-hotplug.rules \
+ 40-redhat.rules \
+ 50-firmware.rules \
+ 50-udev-default.rules \
diff --git a/SOURCES/0497-Revert-systemd-dracut-initqueue.sh-don-t-go-into-eme.patch b/SOURCES/0497-Revert-systemd-dracut-initqueue.sh-don-t-go-into-eme.patch
new file mode 100644
index 0000000..4065d07
--- /dev/null
+++ b/SOURCES/0497-Revert-systemd-dracut-initqueue.sh-don-t-go-into-eme.patch
@@ -0,0 +1,29 @@
+From fb008ce6656f0efb10b3aba4d3740db302b4e683 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Wed, 7 Jun 2017 15:05:44 +0200
+Subject: [PATCH] Revert "systemd/dracut-initqueue.sh: don't go into emergency"
+
+This reverts commit 4c5f1b3b4a3b303b3eb19b0a16122b4fc552e089.
+
+Resolves: #1396865
+---
+ modules.d/98systemd/dracut-initqueue.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
+index c12531e..5822556 100755
+--- a/modules.d/98systemd/dracut-initqueue.sh
++++ b/modules.d/98systemd/dracut-initqueue.sh
+@@ -68,7 +68,11 @@ while :; do
+
+ main_loop=$(($main_loop+1))
+ if [ $main_loop -gt $RDRETRY ]; then
+- # let systemd go into emergency mode, if it cannot boot
++ if ! [ -f /sysroot/etc/fstab ] || ! [ -e /sysroot/sbin/init ] ; then
++ action_on_fail "Could not boot." && break
++ fi
++ warn "Not all disks have been found."
++ warn "You might want to regenerate your initramfs."
+ break
+ fi
+ done
diff --git a/SOURCES/0498-module-setup.sh-Add-ARM-specific-driver-to-initramfs.patch b/SOURCES/0498-module-setup.sh-Add-ARM-specific-driver-to-initramfs.patch
new file mode 100644
index 0000000..8308ae0
--- /dev/null
+++ b/SOURCES/0498-module-setup.sh-Add-ARM-specific-driver-to-initramfs.patch
@@ -0,0 +1,35 @@
+From 784c92876bb6995f8f66087af0f20de2e2819643 Mon Sep 17 00:00:00 2001
+From: Prarit Bhargava <prarit@redhat.com>
+Date: Mon, 5 Jun 2017 07:51:36 -0400
+Subject: [PATCH] module-setup.sh: Add ARM specific driver to initramfs image
+
+If a hisi_sas storage device is used as / during system install, the
+resulting installation will not boot because the hisi_sas driver is not
+included in the initramfs.
+
+The Hisilicon storage driver needs to be added to the initramfs image for
+aarch64 kernels.
+
+Signed-off-by: Prarit Bhargava <prarit@redhat.com>
+Cc: dzickus@redhat.com
+Cc: dmarlin@redhat.com
+Cc: wefu@redhat.com
+Cc: harald@redhat.com
+
+Resolves: #1459277
+---
+ modules.d/90kernel-modules/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 7d9d369..0a414ea 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -64,6 +64,7 @@ installkernel() {
+ "=drivers/rtc" \
+ "=drivers/usb/host" \
+ "=drivers/usb/phy" \
++ "=drivers/scsi/hisi_sas" \
+ ${NULL}
+ fi
+
diff --git a/SOURCES/0499-Add-check-for-aarch64-to-the-arm-kernel-module-list.patch b/SOURCES/0499-Add-check-for-aarch64-to-the-arm-kernel-module-list.patch
new file mode 100644
index 0000000..347a72d
--- /dev/null
+++ b/SOURCES/0499-Add-check-for-aarch64-to-the-arm-kernel-module-list.patch
@@ -0,0 +1,39 @@
+From 436052a84b84183a3b44b19d7a9db02d391bf26a Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 23 Mar 2017 14:59:15 +0000
+Subject: [PATCH] Add check for aarch64 to the arm kernel module list
+
+This adds the same list of drivers we use for arm platforms for
+aarch64 too, also add the DMA drivers there too as they can add
+sigficant performance for some storage/usb and often need to be
+present when the storage drivers load.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+
+Cherry-picked from: 917e1b6b5b2669a30bce69061686adbb6abc5e35
+Resolves: #1459277
+---
+ modules.d/90kernel-modules/module-setup.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 0a414ea..c4bf5af 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -52,13 +52,14 @@ installkernel() {
+ "=drivers/input/serio" \
+ "=drivers/input/keyboard"
+
+- if [[ "$(uname -p)" == arm* ]]; then
+- # arm specific modules
++ if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then
++ # arm/aarch64 specific modules
+ hostonly='' instmods \
+ connector-hdmi connector-dvi encoder-tfp410 \
+ encoder-tpd12s015 i2c-tegra gpio-regulator \
+ as3722-regulator orion-ehci ehci-tegra
+ instmods \
++ "=drivers/dma" \
+ "=drivers/i2c/busses" \
+ "=drivers/regulator" \
+ "=drivers/rtc" \
diff --git a/SOURCES/0500-fips-add-cmac-kernel-module.patch b/SOURCES/0500-fips-add-cmac-kernel-module.patch
new file mode 100644
index 0000000..ee20396
--- /dev/null
+++ b/SOURCES/0500-fips-add-cmac-kernel-module.patch
@@ -0,0 +1,25 @@
+From 3674e2e16f9511f8877a47f58cf5d62f973f83f8 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Tue, 13 Jun 2017 10:28:48 +0200
+Subject: [PATCH] fips: add cmac kernel module
+
+cmac is now marked as fips_allowed
+
+Resolves: rhbz#1460865
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index d553a8c..bd0078d 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -21,7 +21,7 @@ installkernel() {
+ _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+ _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+ _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390 "
+- _fipsmodules+="sha384 sha512 sha512_generic tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib "
++ _fipsmodules+="sha384 sha512 sha512_generic tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib cmac "
+ fi
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
diff --git a/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch b/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch
new file mode 100644
index 0000000..39df399
--- /dev/null
+++ b/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch
@@ -0,0 +1,24 @@
+From 994a6cdd883482ccf24fa9587c28f0e6a8fe031d Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 15 Jun 2017 14:01:13 +0200
+Subject: [PATCH] 95iscsi: run iscsistart with DefaultDependencies=no
+
+In upstream part of 7e51a94f5bc6188511593eda9768aae41467ef04
+
+Resolves: #1461234
+---
+ modules.d/95iscsi/iscsiroot.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index ce8f547..4cf3d35 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
++++ b/modules.d/95iscsi/iscsiroot.sh
+@@ -182,6 +182,7 @@ handle_netroot()
+ if [ "$status" != "activating" ] && ! systemctl is-failed "$netroot_enc" >/dev/null 2>&1; then
+ systemd-run --service-type=oneshot --remain-after-exit --quiet \
+ --description="Login iSCSI Target $iscsi_target_name" \
++ -p 'DefaultDependencies=no' \
+ --unit="$netroot_enc" -- \
+ $(command -v iscsistart) \
+ -i "$iscsi_initiator" -t "$iscsi_target_name" \
diff --git a/SOURCES/0502-01fips-add-authenec-module.patch b/SOURCES/0502-01fips-add-authenec-module.patch
new file mode 100644
index 0000000..6a9f2dc
--- /dev/null
+++ b/SOURCES/0502-01fips-add-authenec-module.patch
@@ -0,0 +1,23 @@
+From 7b9bbc2a82e88f268368309f691b3608832bc9ab Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Wed, 28 Jun 2017 16:10:48 +0200
+Subject: [PATCH] 01fips: add authenec module
+
+Resolves: #1465946
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index bd0078d..ff72bb9 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -21,7 +21,7 @@ installkernel() {
+ _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+ _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+ _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390 "
+- _fipsmodules+="sha384 sha512 sha512_generic tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib cmac "
++ _fipsmodules+="sha384 sha512 sha512_generic tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib cmac authenc "
+ fi
+
+ mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 66366ee..072f1e9 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 033
-Release: 463%{?dist}.2
+Release: 502%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -491,8 +491,47 @@ Patch459: 0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch
Patch460: 0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch
Patch461: 0461-network-fix-dhcp-classless_static_routes.patch
Patch462: 0462-network-do-not-check-firmware-boot-selected-flag.patch
-Patch463: 0492-network-ifup-write-override-file-before-dhcp_do.patch
-Patch464: 0494-ifup-don-t-ifup-team-master-indefinitely.patch
+Patch463: 0463-add-README.md.patch
+Patch464: 0464-README.md-update.patch
+Patch465: 0465-test-test-rpms.txt-add-list-of-rpms-to-install.patch
+Patch466: 0466-test-remove-sudo-calls.patch
+Patch467: 0467-TEST-ISCSI-fix-command-check.patch
+Patch468: 0468-test-test-rpms.txt-add-gzip.patch
+Patch469: 0469-TEST-99-RPM-ignore-openldap-leftovers.patch
+Patch470: 0470-test-Makefile-proper-return-code-for-make-check.patch
+Patch471: 0471-test-rpms.txt-add-dhcp.patch
+Patch472: 0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch
+Patch473: 0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch
+Patch474: 0474-testsuite-guard-against-kernel-panic.patch
+Patch475: 0475-TEST-99-RPM-speedup-test.patch
+Patch476: 0476-fips-module-setup.sh-also-blacklist-the-alias-resolv.patch
+Patch477: 0477-fips-fips.sh-also-check-for-crypto-mod-in-proc-crypt.patch
+Patch478: 0478-README.md-correct-CentOS-build-job-link.patch
+Patch479: 0479-README.md-correct-CentOS-build-job-link.patch
+Patch480: 0480-README.md-correct-CentOS-build-job-link.patch
+Patch481: 0481-fips-module-setup.sh-make-tcrypt-non-optional.patch
+Patch482: 0482-dracut.sh-skip-empty-lines-in-proc-modules.patch
+Patch483: 0483-dracut.conf.5.asc-add-Warning-about-leading-and-trai.patch
+Patch484: 0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch
+Patch485: 0485-add-dracut.pc-pkg-config-file.patch
+Patch486: 0486-dracut.sh-fail-hard-if-we-find-modules-and-modules.d.patch
+Patch487: 0487-99base-add-memtrace-ko.sh-to-debug-kernel-module-lar.patch
+Patch488: 0488-99base-apply-kernel-module-memory-debug-support.patch
+Patch489: 0489-dracut.cmdline.7.asc-update-document-for-rd.memdebug.patch
+Patch490: 0490-testsuite-add-rd.memdebug-4-in-TEST-01-BASIC-to-test.patch
+Patch491: 0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch
+Patch492: 0492-network-ifup-write-override-file-before-dhcp_do.patch
+Patch493: 0493-write-ifcfg-do-t-write-MTU-twice-for-regular-eth-dev.patch
+Patch494: 0494-ifup-don-t-ifup-team-master-indefinitely.patch
+Patch495: 0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch
+Patch496: 0496-udev-rules-pull-in-40-redhat-cpu-hotplug.rules.patch
+Patch497: 0497-Revert-systemd-dracut-initqueue.sh-don-t-go-into-eme.patch
+Patch498: 0498-module-setup.sh-Add-ARM-specific-driver-to-initramfs.patch
+Patch499: 0499-Add-check-for-aarch64-to-the-arm-kernel-module-list.patch
+Patch500: 0500-fips-add-cmac-kernel-module.patch
+Patch501: 0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch
+Patch502: 0502-01fips-add-authenec-module.patch
+
BuildRequires: bash git
@@ -776,6 +815,7 @@ rm -rf -- $RPM_BUILD_ROOT
%endif
%dir %{_sysconfdir}/dracut.conf.d
%dir %{dracutlibdir}/dracut.conf.d
+%{_datadir}/pkgconfig/dracut.pc
%{_mandir}/man8/dracut.8*
%{_mandir}/man8/*service.8*
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
@@ -921,14 +961,53 @@ rm -rf -- $RPM_BUILD_ROOT
%endif
%changelog
-* Wed May 24 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463.2
+* Wed Jun 28 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-502
+- 01fips: add authenec module
+Resolves: #1465946
+
+* Thu Jun 15 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-501
+- 95iscsi: run iscsistart with DefaultDependencies=no
+Resolves: #1461234
+
+* Tue Jun 13 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-500
+- fips: add cmac kernel module
+Resolves: #1460865
+
+* Wed Jun 07 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-499
+- module-setup.sh: Add ARM specific driver to initramfs image
+Resolves: #1459277
+- Revert "systemd/dracut-initqueue.sh: don't go into emergency"
+Resolves: #1396865
+- udev-rules: pull in 40-redhat-cpu-hotplug.rules
+Resolves: #1460707
+
+* Thu Apr 20 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-496
+- 95ssh-client: attempt to copy UserKnownHostsFile to kdump's initramfs
+Resolves: rhbz#1360131
+
+* Thu Apr 06 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-495
- ifup: don't ifup team master indefinitely
-Resolves: rhbz#1454799
-
-* Wed Apr 26 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463.1
+Resolves: rhbz#1416958
+- write-ifcfg: do't write MTU twice for regular eth devices
+Resolves: rhbz#1366163
- network/ifup: write override file before dhcp_do
Resolves: rhbz#1415004
+* Thu Mar 16 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-492
+- rd.memdebug=4
+Resolves: rhbz#1376661
+
+* Fri Mar 10 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-487
+- add upstream tests
+- dracut.sh: fail hard, if we find modules and modules.dep is missing
+Resolves: rhbz#1298656
+- add dracut.pc pkg-config file
+Resolves: rhbz#1397853
+- systemd/dracut-cmdline.sh: unset "UNSET" $root
+Releated: rhbz#1365667
+- dracut.conf.5.asc: add Warning about leading and trailing spaces in lists
+- fips/module-setup.sh: make tcrypt non-optional
+
* Wed Oct 05 2016 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463
- network: do not check "firmware boot selected flag"
Resolves: rhbz#1380581