dracut update version

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
2020-12-14 16:11:44 +01:00 · 2020-12-14 16:11:44 +01:00 · 1e590cb92a
parent 4116216f3e
commit 1e590cb92a
80 changed files with 988 additions and 145 deletions
--- a/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch
+++ b/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch
@ -5,9 +5,9 @@ Subject: [PATCH] fcoe: add FCoE UEFI boot device support

 ---
 modules.d/95fcoe/module-setup.sh   |   1 +
- modules.d/95fcoe/parse-uefifcoe.sh |  35 +++++++++
+ modules.d/95fcoe/parse-uefifcoe.sh |  35 +++++++
 modules.d/99base/module-setup.sh   |   1 +
- modules.d/99base/uefi-lib.sh       | 155 +++++++++++++++++++++++++++++++++++++
+ modules.d/99base/uefi-lib.sh       | 155 +++++++++++++++++++++++++++++
 4 files changed, 192 insertions(+)
 create mode 100755 modules.d/95fcoe/parse-uefifcoe.sh
 create mode 100755 modules.d/99base/uefi-lib.sh
--- a/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch
+++ b/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch
@ -5,9 +5,9 @@ Subject: [PATCH] rootfs-block: add support for the rootfallback= kernel
 cmdline option

 ---
- dracut.cmdline.7.asc                     |  6 +++++
- modules.d/95rootfs-block/module-setup.sh |  3 ++-
- modules.d/95rootfs-block/rootfallback.sh | 46 ++++++++++++++++++++++++++++++++
+ dracut.cmdline.7.asc                     |  6 ++++
+ modules.d/95rootfs-block/module-setup.sh |  3 +-
+ modules.d/95rootfs-block/rootfallback.sh | 46 ++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100755 modules.d/95rootfs-block/rootfallback.sh

--- a/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch
+++ b/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch
@ -5,13 +5,13 @@ Subject: [PATCH] Doc: cleanup, extend and split and reuse

 ---
 Makefile             |   8 +-
- dracut.8.asc         |  61 +---
- dracut.asc           | 888 +--------------------------------------------------
- dracut.cmdline.7.asc | 414 ++++++++++++++----------
- dracut.css           | 434 +------------------------
- dracut.modules.7.asc | 293 +++++++++++++++++
+ dracut.8.asc         |  61 +--
+ dracut.asc           | 888 +------------------------------------------
+ dracut.cmdline.7.asc | 414 +++++++++++---------
+ dracut.css           | 434 +--------------------
+ dracut.modules.7.asc | 293 ++++++++++++++
 dracut.spec          |   1 +
- dracut.usage.asc     | 526 ++++++++++++++++++++++++++++++
+ dracut.usage.asc     | 526 +++++++++++++++++++++++++
 8 files changed, 1084 insertions(+), 1541 deletions(-)
 create mode 100644 dracut.modules.7.asc
 create mode 100644 dracut.usage.asc
--- a/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch
+++ b/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch
@ -4,7 +4,7 @@ Date: Mon, 21 Oct 2013 09:09:26 +0200
 Subject: [PATCH] lvm: always install thin utils for lvm

 ---
- modules.d/90lvm/module-setup.sh | 34 ++++++++--------------------------
+ modules.d/90lvm/module-setup.sh | 34 ++++++++-------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

 diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
--- a/SOURCES/0037-resume-remove-resume-genrules.sh.patch
+++ b/SOURCES/0037-resume-remove-resume-genrules.sh.patch
@ -13,7 +13,7 @@ dracut-initqueue: rm: cannot remove '/lib/dracut/hooks/initqueue/settled/resume.
 dracut-initqueue: rm: cannot remove '/lib/dracut/hooks/initqueue/timeout/resume.sh': No such file or directory
 ---
 modules.d/95resume/module-setup.sh    |  1 -
- modules.d/95resume/resume-genrules.sh | 51 -----------------------------------
+ modules.d/95resume/resume-genrules.sh | 51 ---------------------------
 2 files changed, 52 deletions(-)
 delete mode 100755 modules.d/95resume/resume-genrules.sh

--- a/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch
+++ b/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch
@ -6,7 +6,7 @@ Subject: [PATCH] network/net-lib.sh:iface_has_link() fixup
 Just echo'ing the flags IFF_UP|IFF_RUNNING does _not_ reflect the
 carrier state immediately. So wait for it to really show up.
 ---
- modules.d/40network/net-lib.sh | 47 +++++++++++++++++++++---------------------
+ modules.d/40network/net-lib.sh | 47 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 24 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch
+++ b/SOURCES/0063-test-TEST-17-LVM-THIN-add-test-case-for-lvm-thin-poo.patch
@ -5,13 +5,13 @@ Subject: [PATCH] test/TEST-17-LVM-THIN: add test case for lvm thin pools

 ---
 test/TEST-17-LVM-THIN/.testdir             |  1 +
- test/TEST-17-LVM-THIN/99-idesymlinks.rules |  8 +++
- test/TEST-17-LVM-THIN/Makefile             | 10 ++++
- test/TEST-17-LVM-THIN/create-root.sh       | 31 +++++++++++
+ test/TEST-17-LVM-THIN/99-idesymlinks.rules |  8 ++
+ test/TEST-17-LVM-THIN/Makefile             | 10 +++
+ test/TEST-17-LVM-THIN/create-root.sh       | 31 ++++++++
 test/TEST-17-LVM-THIN/finished-false.sh    |  2 +
 test/TEST-17-LVM-THIN/hard-off.sh          |  3 +
- test/TEST-17-LVM-THIN/test-init.sh         | 17 ++++++
- test/TEST-17-LVM-THIN/test.sh              | 88 ++++++++++++++++++++++++++++++
+ test/TEST-17-LVM-THIN/test-init.sh         | 17 +++++
+ test/TEST-17-LVM-THIN/test.sh              | 88 ++++++++++++++++++++++
 8 files changed, 160 insertions(+)
 create mode 100644 test/TEST-17-LVM-THIN/.testdir
 create mode 100644 test/TEST-17-LVM-THIN/99-idesymlinks.rules
--- a/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch
+++ b/SOURCES/0066-dracut-lib-wait_for_dev-prevent-systemd-daemon-reloa.patch
@ -7,8 +7,8 @@ prevent a systemd daemon-reload, if it is not necessary to do.
 ---
 modules.d/98systemd/dracut-cmdline.sh   |  2 --
 modules.d/98systemd/module-setup.sh     |  2 ++
- modules.d/98systemd/rootfs-generator.sh | 30 ++++++++++++++++++++++++++++++
- modules.d/99base/dracut-lib.sh          | 30 ++++++++++++++++++++++++------
+ modules.d/98systemd/rootfs-generator.sh | 30 +++++++++++++++++++++++++
+ modules.d/99base/dracut-lib.sh          | 30 ++++++++++++++++++++-----
 4 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100755 modules.d/98systemd/rootfs-generator.sh

--- a/SOURCES/0073-documentation-line-wrap.patch
+++ b/SOURCES/0073-documentation-line-wrap.patch
@ -4,13 +4,13 @@ Date: Thu, 9 Jan 2014 12:17:01 +0100
 Subject: [PATCH] documentation: line wrap

 ---
- dracut.8.asc         |  16 ++++---
+ dracut.8.asc         |  16 +++---
 dracut.asc           |  12 +++--
 dracut.bootup.7.asc  |   3 +-
- dracut.cmdline.7.asc | 125 ++++++++++++++++++++++++++++++++-------------------
- dracut.conf.5.asc    |  18 +++++---
- dracut.modules.7.asc |  45 +++++++++++--------
- dracut.usage.asc     |  45 ++++++++++++-------
+ dracut.cmdline.7.asc | 125 +++++++++++++++++++++++++++----------------
+ dracut.conf.5.asc    |  18 ++++---
+ dracut.modules.7.asc |  45 +++++++++-------
+ dracut.usage.asc     |  45 ++++++++++------
 mkinitrd.8.asc       |   4 +-
 8 files changed, 165 insertions(+), 103 deletions(-)

--- a/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch
+++ b/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch
@ -5,8 +5,8 @@ Subject: [PATCH] iscsi: more iscsiroot fixes

 handle iscsiroot with firmware more gracefully
 ---
- modules.d/95iscsi/iscsiroot.sh       | 68 +++++++++++++++++++++++++-----------
- modules.d/95iscsi/parse-iscsiroot.sh |  6 ++--
+ modules.d/95iscsi/iscsiroot.sh       | 68 +++++++++++++++++++---------
+ modules.d/95iscsi/parse-iscsiroot.sh |  6 +--
 2 files changed, 50 insertions(+), 24 deletions(-)

 diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
--- a/SOURCES/0094-add-skipcpio-utility.patch
+++ b/SOURCES/0094-add-skipcpio-utility.patch
@ -7,8 +7,8 @@ skipcpio skips a cpio archive at the beginning of a file.

 It is used for skipping an early cpio archive for lsinitrd.
 ---
- Makefile            |  13 +++++-
- skipcpio/skipcpio.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile            |  13 ++++-
+ skipcpio/skipcpio.c | 123 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 skipcpio/skipcpio.c

--- a/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch
+++ b/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch
@ -6,7 +6,7 @@ Subject: [PATCH] lsinitrd.sh: make use of the skipcpio utility
 With the skipcpio utility, the whole contents of an initramfs with an
 early cpio image can be displayed.
 ---
- lsinitrd.sh | 96 +++++++++++++++++++++++++++++++++++++++++++++++--------------
+ lsinitrd.sh | 96 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 75 insertions(+), 21 deletions(-)

 diff --git a/lsinitrd.sh b/lsinitrd.sh
--- a/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch
+++ b/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch
@ -4,9 +4,9 @@ Date: Thu, 12 Dec 2013 09:20:53 +0100
 Subject: [PATCH] fcoe: move uefi parsing to fcoe-uefi module

 ---
- modules.d/95fcoe-uefi/module-setup.sh              | 22 ++++++++++++++++++++++
- .../{95fcoe => 95fcoe-uefi}/parse-uefifcoe.sh      |  0
- modules.d/95fcoe/module-setup.sh                   |  1 -
+ modules.d/95fcoe-uefi/module-setup.sh         | 22 +++++++++++++++++++
+ .../{95fcoe => 95fcoe-uefi}/parse-uefifcoe.sh |  0
+ modules.d/95fcoe/module-setup.sh              |  1 -
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 modules.d/95fcoe-uefi/module-setup.sh
 rename modules.d/{95fcoe => 95fcoe-uefi}/parse-uefifcoe.sh (100%)
--- a/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch
+++ b/SOURCES/0131-Add-flag-to-toggle-hostonly-cmdline-storing-in-the-i.patch
@ -9,14 +9,14 @@ Subject: [PATCH] Add flag to toggle hostonly cmdline storing in the initramfs
 --no-hostonly-cmdline:
    Do not store kernel command line arguments needed in the initramfs
 ---
- dracut.8.asc                             |  6 ++++++
+ dracut.8.asc                             |  6 +++++
 dracut.conf.5.asc                        |  3 +++
- dracut.sh                                | 27 +++++++++++++++++++++------
- modules.d/90crypt/module-setup.sh        |  6 ++++--
- modules.d/90dmraid/module-setup.sh       |  6 ++++--
- modules.d/90lvm/module-setup.sh          |  6 ++++--
- modules.d/90mdraid/module-setup.sh       |  6 ++++--
- modules.d/95rootfs-block/module-setup.sh | 31 ++++++++++++++++++++-----------
+ dracut.sh                                | 27 ++++++++++++++++-----
+ modules.d/90crypt/module-setup.sh        |  6 +++--
+ modules.d/90dmraid/module-setup.sh       |  6 +++--
+ modules.d/90lvm/module-setup.sh          |  6 +++--
+ modules.d/90mdraid/module-setup.sh       |  6 +++--
+ modules.d/95rootfs-block/module-setup.sh | 31 +++++++++++++++---------
 8 files changed, 66 insertions(+), 25 deletions(-)

 diff --git a/dracut.8.asc b/dracut.8.asc
--- a/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch
+++ b/SOURCES/0133-systemd-rootfs-generator.sh-generate-units-in-run-sy.patch
@ -10,7 +10,7 @@ systemd.
 https://bugzilla.redhat.com/show_bug.cgi?id=1069133
 https://bugzilla.redhat.com/show_bug.cgi?id=949697
 ---
- modules.d/98systemd/rootfs-generator.sh | 33 ++++++++++++++++++++++++++++++++-
+ modules.d/98systemd/rootfs-generator.sh | 33 ++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

 diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh
--- a/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch
+++ b/SOURCES/0136-network-dhclient-script.sh-DHCP-IPv6-interface-setup.patch
@ -7,7 +7,7 @@ configure IPv6 interface for DHCP6

 https://bugzilla.redhat.com/show_bug.cgi?id=1064365
 ---
- modules.d/40network/dhclient-script.sh | 49 ++++++++++++++++++++++++++++++++++
+ modules.d/40network/dhclient-script.sh | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

 diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
--- a/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch
+++ b/SOURCES/0146-Do-not-wait_for_dev-if-hostonly_cmdline-not-set.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Do not wait_for_dev if hostonly_cmdline not set

 ---
 dracut.sh                        |  2 +-
- modules.d/99base/module-setup.sh | 40 +++++++++++++++++++++-------------------
+ modules.d/99base/module-setup.sh | 40 +++++++++++++++++---------------
 2 files changed, 22 insertions(+), 20 deletions(-)

 diff --git a/dracut.sh b/dracut.sh
--- a/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch
+++ b/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch
@ -4,7 +4,7 @@ Date: Mon, 17 Mar 2014 13:00:17 +0100
 Subject: [PATCH] network:dhclient-script do PREINIT6 for DHCP6

 ---
- modules.d/40network/dhclient-script.sh | 29 ++++++++++++++++-------------
+ modules.d/40network/dhclient-script.sh | 29 ++++++++++++++------------
 modules.d/40network/ifup.sh            |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

--- a/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch
+++ b/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch
@ -12,11 +12,11 @@ Conflicts:
 	modules.d/98systemd/dracut-cmdline.sh
 	modules.d/99base/init.sh
 ---
- dracut.cmdline.7.asc                           |  4 ++++
- modules.d/98systemd/dracut-cmdline-ask.service | 33 ++++++++++++++++++++++++++
- modules.d/98systemd/dracut-cmdline-ask.sh      | 20 ++++++++++++++++
- modules.d/98systemd/module-setup.sh            |  2 ++
- modules.d/99base/init.sh                       |  8 +++++++
+ dracut.cmdline.7.asc                          |  4 +++
+ .../98systemd/dracut-cmdline-ask.service      | 33 +++++++++++++++++++
+ modules.d/98systemd/dracut-cmdline-ask.sh     | 20 +++++++++++
+ modules.d/98systemd/module-setup.sh           |  2 ++
+ modules.d/99base/init.sh                      |  8 +++++
 5 files changed, 67 insertions(+)
 create mode 100644 modules.d/98systemd/dracut-cmdline-ask.service
 create mode 100755 modules.d/98systemd/dracut-cmdline-ask.sh
--- a/SOURCES/0200-network-add-rd.route-parameter.patch
+++ b/SOURCES/0200-network-add-rd.route-parameter.patch
@ -5,8 +5,8 @@ Subject: [PATCH] network: add rd.route parameter

 (cherry picked from commit 7b46244bb94e3dfd635a8d222044ae7fc920240d)
 ---
- dracut.cmdline.7.asc             | 15 +++++++++++++-
- modules.d/40network/net-lib.sh   | 42 ++++++++++++++++++++++++++++++++++++++++
+ dracut.cmdline.7.asc             | 15 +++++++++++-
+ modules.d/40network/net-lib.sh   | 42 ++++++++++++++++++++++++++++++++
 modules.d/45ifcfg/write-ifcfg.sh |  3 +++
 3 files changed, 59 insertions(+), 1 deletion(-)

--- a/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch
+++ b/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch
@ -32,7 +32,7 @@ Simplified the cpio extraction process by using 'lsinitrd'.

 (cherry picked from commit 659dc319d950999f8d191a81fdc4d3114e9213de)
 ---
- dracut.sh | 342 ++++++++++++++++++++++++++++++++++++++------------------------
+ dracut.sh | 342 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 210 insertions(+), 132 deletions(-)

 diff --git a/dracut.sh b/dracut.sh
--- a/SOURCES/0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch
+++ b/SOURCES/0213-network-net-lib.sh-parse_iscsi_root-do-not-enforce-t.patch
@ -8,7 +8,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1078867

 cherry-picked from 29763cb72d17fe8d22766170ec06b32419829243
 ---
- modules.d/40network/net-lib.sh | 112 ++++++++++++++++++-----------------------
+ modules.d/40network/net-lib.sh | 112 +++++++++++++++------------------
 1 file changed, 50 insertions(+), 62 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0216-fixed-bridge-setup.patch
+++ b/SOURCES/0216-fixed-bridge-setup.patch
@ -9,10 +9,10 @@ fixed ifcfg generation

 (cherry picked from commit 2db6d7111870c5d16d812d9cddc23558f3f4a202)
 ---
- modules.d/40network/ifup.sh         |  4 ++--
+ modules.d/40network/ifup.sh         |  4 +--
 modules.d/40network/net-genrules.sh |  2 +-
- modules.d/40network/parse-bridge.sh | 18 ++++++++--------
- modules.d/45ifcfg/write-ifcfg.sh    | 42 +++++++++----------------------------
+ modules.d/40network/parse-bridge.sh | 18 ++++++-------
+ modules.d/45ifcfg/write-ifcfg.sh    | 42 +++++++----------------------
 4 files changed, 22 insertions(+), 44 deletions(-)

 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
--- a/SOURCES/0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch
+++ b/SOURCES/0218-ifcfg-write-ifcfg.sh-bind-bond-and-bridge-interfaces.patch
@ -10,7 +10,7 @@ Previously, this was bound unconditionally with HWADDR.

 (cherry picked from commit 80043e21c16db168ad087a162f1fa97cae866c8d)
 ---
- modules.d/45ifcfg/write-ifcfg.sh | 47 ++++++++++++++++++++++------------------
+ modules.d/45ifcfg/write-ifcfg.sh | 47 ++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 21 deletions(-)

 diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
--- a/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch
+++ b/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch
@ -5,7 +5,7 @@ Subject: [PATCH] cms/cmssetup.sh: fixed indention

 (cherry picked from commit d68163551226d302677e358e721560d8d651a30f)
 ---
- modules.d/80cms/cmssetup.sh | 260 ++++++++++++++++++++++----------------------
+ modules.d/80cms/cmssetup.sh | 260 ++++++++++++++++++------------------
 1 file changed, 130 insertions(+), 130 deletions(-)

 diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
--- a/SOURCES/0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch
+++ b/SOURCES/0225-ifcfg-write-ifcfg-only-write-DEVICE-for-non-kernel-n.patch
@ -8,8 +8,8 @@ DEVICE="<iface>", if HWADDR is given.

 (cherry picked from commit 3947f07d93cde5e1cf0d788537e93b135d6c27b0)
 ---
- modules.d/40network/net-lib.sh   | 46 ++++++++++++++++++++++++++++++-
- modules.d/45ifcfg/write-ifcfg.sh | 59 ++++++++++++++++++++++++++--------------
+ modules.d/40network/net-lib.sh   | 46 ++++++++++++++++++++++++-
+ modules.d/45ifcfg/write-ifcfg.sh | 59 +++++++++++++++++++++-----------
 2 files changed, 84 insertions(+), 21 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch
+++ b/SOURCES/0228-net-lib.sh-parse_iscsi_root-fix-target-parsing.patch
@ -14,7 +14,7 @@ the fallback parser by checking the LUN for a numerical value.

 (cherry picked from commit 36e8ce4fb01824b49697bd0e7ad3ca3c4cfd4297)
 ---
- modules.d/40network/net-lib.sh | 50 ++++++++++++++++++++++++++++++++----------
+ modules.d/40network/net-lib.sh | 50 ++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 12 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch
+++ b/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch
@ -7,8 +7,8 @@ ip=eth0:auto6,dhcp

 might work now
 ---
- modules.d/40network/ifup.sh          | 24 ++++++++++++-----------
- modules.d/40network/parse-ip-opts.sh | 38 +++++++++++++++++++-----------------
+ modules.d/40network/ifup.sh          | 24 ++++++++++--------
+ modules.d/40network/parse-ip-opts.sh | 38 +++++++++++++++-------------
 2 files changed, 33 insertions(+), 29 deletions(-)

 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
--- a/SOURCES/0235-network-enhance-team-support.patch
+++ b/SOURCES/0235-network-enhance-team-support.patch
@ -11,12 +11,12 @@ ifcfg files in the initramfs.
 Create a default loadbalance team config, if none present in the
 initramfs.
 ---
- modules.d/40network/ifup.sh         | 38 ++++++++++++++++++++++++++++---------
- modules.d/40network/module-setup.sh | 37 ++++++++++++++++++++++++++++++++++++
- modules.d/40network/net-genrules.sh |  9 ++++++---
- modules.d/40network/net-lib.sh      | 18 ++++++++++++++++++
- modules.d/40network/parse-team.sh   | 30 +++++++++++++++++++----------
- modules.d/45ifcfg/write-ifcfg.sh    | 10 +++++++++-
+ modules.d/40network/ifup.sh         | 38 ++++++++++++++++++++++-------
+ modules.d/40network/module-setup.sh | 37 ++++++++++++++++++++++++++++
+ modules.d/40network/net-genrules.sh |  9 ++++---
+ modules.d/40network/net-lib.sh      | 18 ++++++++++++++
+ modules.d/40network/parse-team.sh   | 30 +++++++++++++++--------
+ modules.d/45ifcfg/write-ifcfg.sh    | 10 +++++++-
 6 files changed, 119 insertions(+), 23 deletions(-)

 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
--- a/SOURCES/0251-Factor-out-all-the-type-V-commands.patch
+++ b/SOURCES/0251-Factor-out-all-the-type-V-commands.patch
@ -15,16 +15,16 @@ module is not included in the initramfs.

 (cherry picked from commit 30e6e809ed8d189cc8374df3c28cfbcab5a299b9)
 ---
- dracut-functions.sh                           | 57 ++++++++++++++++++++++++---
+ dracut-functions.sh                           | 57 +++++++++++++++++--
 modules.d/00bash/module-setup.sh              |  2 +-
 modules.d/00bootchart/module-setup.sh         |  2 +-
 modules.d/00dash/module-setup.sh              |  2 +-
 modules.d/00systemd-bootchart/module-setup.sh |  2 +-
- modules.d/02caps/module-setup.sh              | 14 ++++---
+ modules.d/02caps/module-setup.sh              | 14 +++--
 modules.d/03modsign/module-setup.sh           |  2 +-
 modules.d/05busybox/module-setup.sh           |  2 +-
 modules.d/10i18n/module-setup.sh              |  4 +-
- modules.d/40network/module-setup.sh           |  7 +---
+ modules.d/40network/module-setup.sh           |  7 +--
 modules.d/45url-lib/module-setup.sh           |  2 +-
 modules.d/50plymouth/module-setup.sh          |  2 +-
 modules.d/90btrfs/module-setup.sh             |  2 +-
@ -35,16 +35,16 @@ module is not included in the initramfs.
 modules.d/90mdraid/module-setup.sh            |  2 +-
 modules.d/90multipath/module-setup.sh         |  2 +-
 modules.d/91crypt-gpg/module-setup.sh         |  2 +-
- modules.d/91crypt-loop/module-setup.sh        | 21 ++++++----
+ modules.d/91crypt-loop/module-setup.sh        | 21 ++++---
 modules.d/95cifs/module-setup.sh              |  2 +-
 modules.d/95dasd/module-setup.sh              |  1 +
 modules.d/95dasd_mod/module-setup.sh          |  1 +
 modules.d/95fcoe-uefi/module-setup.sh         |  4 +-
- modules.d/95fcoe/module-setup.sh              |  5 +--
+ modules.d/95fcoe/module-setup.sh              |  5 +-
 modules.d/95iscsi/module-setup.sh             |  2 +-
 modules.d/95nbd/module-setup.sh               |  2 +-
 modules.d/95nfs/module-setup.sh               |  4 +-
- modules.d/95ssh-client/module-setup.sh        |  6 +--
+ modules.d/95ssh-client/module-setup.sh        |  6 +-
 modules.d/95udev-rules/module-setup.sh        |  2 +-
 modules.d/95zfcp/module-setup.sh              |  2 +
 modules.d/95znet/module-setup.sh              |  2 +
--- a/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch
+++ b/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch
@ -9,8 +9,8 @@ effects.
 (cherry picked from commit 777f2db0373ccbc1a44fc2d960ecefbe50195055)
 ---
 Makefile                          |  1 +
- dracut-functions.sh               |  9 ++-------
- dracut-init.sh                    | 34 ++++++++++++++++++++++++++++++++++
+ dracut-functions.sh               |  9 ++------
+ dracut-init.sh                    | 34 +++++++++++++++++++++++++++++++
 dracut.sh                         |  8 ++++----
 dracut.spec                       |  1 +
 test/TEST-01-BASIC/test.sh        |  6 +++---
@ -27,7 +27,7 @@ effects.
 test/TEST-17-LVM-THIN/test.sh     |  6 +++---
 test/TEST-20-NFS/test.sh          |  6 +++---
 test/TEST-30-ISCSI/test.sh        |  8 ++++----
- test/TEST-40-NBD/test.sh          | 10 +++++-----
+ test/TEST-40-NBD/test.sh          | 10 ++++-----
 test/TEST-50-MULTINIC/test.sh     |  6 +++---
 21 files changed, 92 insertions(+), 61 deletions(-)
 create mode 100644 dracut-init.sh
--- a/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch
+++ b/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch
@ -15,9 +15,9 @@ options is included.
 Signed-off-by: Major Hayden <major@mhtx.net>
 (cherry picked from commit 504c0a8feca7d7ef470e4483a68cbaf9cb7df2bf)
 ---
- dracut.cmdline.7.asc                            | 82 ++++++++++++++++++++++++-
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 16 ++++-
- modules.d/90dmsquash-live/module-setup.sh       |  2 +-
+ dracut.cmdline.7.asc                          | 82 ++++++++++++++++++-
+ .../90dmsquash-live/dmsquash-live-root.sh     | 16 +++-
+ modules.d/90dmsquash-live/module-setup.sh     |  2 +-
 3 files changed, 96 insertions(+), 4 deletions(-)

 diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
--- a/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch
+++ b/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch
@ -13,8 +13,8 @@ memory, and freed blocks will really be freed in ram.
 Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>
 (cherry picked from commit d6e34d362a05cda61baaf8e231ad3f0e8665a9cc)
 ---
- dracut.cmdline.7.asc                            |  7 +++++++
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 27 ++++++++++++++++++++++++-
+ dracut.cmdline.7.asc                          |  7 +++++
+ .../90dmsquash-live/dmsquash-live-root.sh     | 27 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

 diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
--- a/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch
+++ b/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch
@ -14,8 +14,8 @@ got added.
 Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>
 (cherry picked from commit b0472eac111268e2cae783097d0eccc1986e1762)
 ---
- dracut.cmdline.7.asc                            |  9 ++++
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 64 +++++++++++++------------
+ dracut.cmdline.7.asc                          |  9 +++
+ .../90dmsquash-live/dmsquash-live-root.sh     | 64 ++++++++++---------
 2 files changed, 42 insertions(+), 31 deletions(-)

 diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
--- a/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch
+++ b/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch
@ -8,7 +8,7 @@ all the time, just include all HID drivers.

 (cherry picked from commit 180e9d78516fb4b2ee5baef44521007a860d4dd2)
 ---
- modules.d/90kernel-modules/module-setup.sh | 25 ++++++++++++++++++-------
+ modules.d/90kernel-modules/module-setup.sh | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

 diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
--- a/SOURCES/0266-network-add-options-to-tweak-timeouts.patch
+++ b/SOURCES/0266-network-add-options-to-tweak-timeouts.patch
@ -29,9 +29,9 @@ Subject: [PATCH] network: add options to tweak timeouts
 rd.net.timeout.carrier=<seconds>
     Wait <seconds> until carrier is recognized. Default is 5 seconds.
 ---
- dracut.cmdline.7.asc           | 25 +++++++++++++++++++++++++
- modules.d/40network/ifup.sh    | 26 ++++++++++++++++++++++----
- modules.d/40network/net-lib.sh | 36 ++++++++++++++++++++++++++++++------
+ dracut.cmdline.7.asc           | 25 +++++++++++++++++++++++
+ modules.d/40network/ifup.sh    | 26 ++++++++++++++++++++----
+ modules.d/40network/net-lib.sh | 36 ++++++++++++++++++++++++++++------
 3 files changed, 77 insertions(+), 10 deletions(-)

 diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
--- a/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch
+++ b/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch
@ -7,7 +7,7 @@ Subject: [PATCH] fcoe/fcoe-edd.sh: cleanup the script
 - add a timeout for /sys/firmware/edd
 - only remove the module, if it was loaded by the script
 ---
- modules.d/95fcoe/fcoe-edd.sh | 46 ++++++++++++++++++++++++++++++--------------
+ modules.d/95fcoe/fcoe-edd.sh | 46 +++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

 diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh
--- a/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch
+++ b/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch
@ -22,9 +22,9 @@ everything in the initqueue/timeout.
 (cherry picked from commit d94050ddaea8343d8adb8f151c8f4cad591d29d9)
 ---
 modules.d/95iscsi/cleanup-iscsi.sh   |   2 +-
- modules.d/95iscsi/iscsiroot.sh       | 116 ++++++++++++++++++++++++-----------
- modules.d/95iscsi/module-setup.sh    |  31 ++++++++++
- modules.d/95iscsi/parse-iscsiroot.sh |  27 ++++++--
+ modules.d/95iscsi/iscsiroot.sh       | 116 +++++++++++++++++++--------
+ modules.d/95iscsi/module-setup.sh    |  31 +++++++
+ modules.d/95iscsi/parse-iscsiroot.sh |  27 +++++--
 4 files changed, 134 insertions(+), 42 deletions(-)

 diff --git a/modules.d/95iscsi/cleanup-iscsi.sh b/modules.d/95iscsi/cleanup-iscsi.sh
--- a/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch
+++ b/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch
@ -12,10 +12,10 @@ Test the new iSCSI parameters rd.iscsi.waitnet and rd.iscsi.testroute.

 (cherry picked from commit c22c43f81a5f15c8759e6aa69773d0e9010c4741)
 ---
- README.testsuite                  |  20 ++++---
- test/TEST-30-ISCSI/server-init.sh |  24 +++++++-
- test/TEST-30-ISCSI/targets        |  25 --------
- test/TEST-30-ISCSI/test.sh        | 119 +++++++++++++++++++++++++++-----------
+ README.testsuite                  |  20 ++---
+ test/TEST-30-ISCSI/server-init.sh |  24 +++++-
+ test/TEST-30-ISCSI/targets        |  25 -------
+ test/TEST-30-ISCSI/test.sh        | 119 +++++++++++++++++++++---------
 4 files changed, 117 insertions(+), 71 deletions(-)
 delete mode 100644 test/TEST-30-ISCSI/targets

--- a/SOURCES/0301-iscsi-handle-timeout-case-better.patch
+++ b/SOURCES/0301-iscsi-handle-timeout-case-better.patch
@ -4,8 +4,8 @@ Date: Tue, 18 Aug 2015 11:50:15 +0200
 Subject: [PATCH] iscsi: handle timeout case better

 ---
- modules.d/95iscsi/iscsiroot.sh       |  6 +++---
- modules.d/95iscsi/parse-iscsiroot.sh | 41 +++++++++++++++++++++---------------
+ modules.d/95iscsi/iscsiroot.sh       |  6 ++--
+ modules.d/95iscsi/parse-iscsiroot.sh | 41 ++++++++++++++++------------
 2 files changed, 27 insertions(+), 20 deletions(-)

 diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
--- a/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch
+++ b/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch
@ -5,7 +5,7 @@ Subject: [PATCH] multipath: add hostonly multipath.conf

 Resolves: rhbz#994702
 ---
- modules.d/90multipath/module-setup.sh | 43 ++++++++++++++++++++++++++++-------
+ modules.d/90multipath/module-setup.sh | 43 ++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 8 deletions(-)

 diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
--- a/SOURCES/0337-dracut.usage.asc-update-man-page.patch
+++ b/SOURCES/0337-dracut.usage.asc-update-man-page.patch
@ -6,7 +6,7 @@ Subject: [PATCH] dracut.usage.asc: update man page
 - clarify grub2 config for debugging
 - clarify hostonly mode
 ---
- dracut.usage.asc | 74 ++++++++++++++++++--------------------------------------
+ dracut.usage.asc | 74 +++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 51 deletions(-)

 diff --git a/dracut.usage.asc b/dracut.usage.asc
--- a/SOURCES/0342-iscsi-iscsiroot.sh-handle-iscsi_firmware-in-online-a.patch
+++ b/SOURCES/0342-iscsi-iscsiroot.sh-handle-iscsi_firmware-in-online-a.patch
@ -7,7 +7,7 @@ Subject: [PATCH] iscsi/iscsiroot.sh: handle iscsi_firmware in online and
 The return code of iscsi_firmware is broken, so set the marker
 unconditionally.
 ---
- modules.d/95iscsi/iscsiroot.sh | 43 +++++++++++++++++++-----------------------
+ modules.d/95iscsi/iscsiroot.sh | 43 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

 diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
--- a/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch
+++ b/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch
@ -5,7 +5,7 @@ Subject: [PATCH] iscsi/iscsiroot.sh: better put variables in quotes

 first rule for a bash programmer
 ---
- modules.d/95iscsi/iscsiroot.sh | 62 +++++++++++++++++++++---------------------
+ modules.d/95iscsi/iscsiroot.sh | 62 +++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

 diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
--- a/SOURCES/0362-network-fix-carrier-detection.patch
+++ b/SOURCES/0362-network-fix-carrier-detection.patch
@ -13,8 +13,8 @@ checking for static configurations.

 (cherry picked from commit df95b1003c8e7564da73de92403013763eb028fe)
 ---
- modules.d/40network/ifup.sh    | 42 ++++++++++++++++++++-----------------
- modules.d/40network/net-lib.sh | 47 ++++++++++++++++++++++++++----------------
+ modules.d/40network/ifup.sh    | 42 ++++++++++++++++--------------
+ modules.d/40network/net-lib.sh | 47 +++++++++++++++++++++-------------
 2 files changed, 52 insertions(+), 37 deletions(-)

 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
--- a/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch
+++ b/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch
@ -6,8 +6,8 @@ Subject: [PATCH] network/dhclient-script.sh: add classless-static-routes

 https://bugzilla.redhat.com/show_bug.cgi?id=1260955
 ---
- modules.d/40network/dhclient-script.sh | 48 ++++++++++++++++++++++++++++++++++
- modules.d/40network/dhclient.conf      |  5 +++-
+ modules.d/40network/dhclient-script.sh | 48 ++++++++++++++++++++++++++
+ modules.d/40network/dhclient.conf      |  5 ++-
 2 files changed, 52 insertions(+), 1 deletion(-)

 diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
--- a/SOURCES/0396-dracut-only-use-one-tmpdir.patch
+++ b/SOURCES/0396-dracut-only-use-one-tmpdir.patch
@ -6,7 +6,7 @@ Subject: [PATCH] dracut: only use one tmpdir
 also remove any partial written initramfs images
 ---
 dracut-logger.sh |  3 +--
- dracut.sh        | 66 +++++++++++++++++++++++++++++++++++++++-----------------
+ dracut.sh        | 66 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 47 insertions(+), 22 deletions(-)

 diff --git a/dracut-logger.sh b/dracut-logger.sh
--- a/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch
+++ b/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch
@ -13,7 +13,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 Signed-off-by: Thomas Renninger <trenn@suse.de>
 (cherry picked from commit 8b257fcc86f9a470613c1a5719641144a688acf7)
 ---
- modules.d/95fcoe/module-setup.sh | 45 ++++++++++++++++++++++++++++++++++++++++
+ modules.d/95fcoe/module-setup.sh | 45 ++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

 diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
--- a/SOURCES/0408-network-support-macaddr-in-brackets.patch
+++ b/SOURCES/0408-network-support-macaddr-in-brackets.patch
@ -21,7 +21,7 @@ ip=::::test:ens3:dhcp::[54:52:00:ab:cd:ef]
 ip=::::test:ens3:dhcp:1000:54:52:00:ab:cd:ef
 ip=::::test:ens3:dhcp:1000:[54:52:00:ab:cd:ef]
 ---
- modules.d/40network/net-lib.sh | 119 ++++++++++++++++++++++++++---------------
+ modules.d/40network/net-lib.sh | 119 +++++++++++++++++++++------------
 1 file changed, 75 insertions(+), 44 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0411-test-add-TEST-60-MTUMAC.patch
+++ b/SOURCES/0411-test-add-TEST-60-MTUMAC.patch
@ -6,15 +6,15 @@ Subject: [PATCH] test: add TEST-60-MTUMAC
 test MTU and MACADDR setting
 ---
 test/TEST-60-MTUMAC/99-idesymlinks.rules |   8 +
- test/TEST-60-MTUMAC/Makefile             |  10 ++
- test/TEST-60-MTUMAC/client-init.sh       |  22 +++
+ test/TEST-60-MTUMAC/Makefile             |  10 +
+ test/TEST-60-MTUMAC/client-init.sh       |  22 ++
 test/TEST-60-MTUMAC/dhcpd.conf           |  15 ++
 test/TEST-60-MTUMAC/exports              |   1 +
 test/TEST-60-MTUMAC/finished-false.sh    |   2 +
 test/TEST-60-MTUMAC/hard-off.sh          |   3 +
 test/TEST-60-MTUMAC/hosts                |   5 +
- test/TEST-60-MTUMAC/server-init.sh       |  98 +++++++++++
- test/TEST-60-MTUMAC/test.sh              | 282 +++++++++++++++++++++++++++++++
+ test/TEST-60-MTUMAC/server-init.sh       |  98 ++++++++
+ test/TEST-60-MTUMAC/test.sh              | 282 +++++++++++++++++++++++
 10 files changed, 446 insertions(+)
 create mode 100644 test/TEST-60-MTUMAC/99-idesymlinks.rules
 create mode 100644 test/TEST-60-MTUMAC/Makefile
--- a/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
+++ b/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
@ -12,7 +12,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 Signed-off-by: Thomas Renninger <trenn@suse.com>
 (cherry picked from commit c98d1756f766e49f7b457e217b0e0156d577d8b8)
 ---
- modules.d/40network/net-lib.sh | 38 ++++++++++++++++++++++++++++++++++----
+ modules.d/40network/net-lib.sh | 38 ++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
--- a/SOURCES/0423-virtfs-use-systemd-generator.patch
+++ b/SOURCES/0423-virtfs-use-systemd-generator.patch
@ -5,9 +5,9 @@ Subject: [PATCH] virtfs: use systemd generator

 use a systemd generator, instead of a dracut hook to mount
 ---
- modules.d/95virtfs/module-setup.sh     |  7 +++++-
+ modules.d/95virtfs/module-setup.sh     |  7 ++++-
 modules.d/95virtfs/parse-virtfs.sh     |  2 +-
- modules.d/95virtfs/virtfs-generator.sh | 39 ++++++++++++++++++++++++++++++++++
+ modules.d/95virtfs/virtfs-generator.sh | 39 ++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100755 modules.d/95virtfs/virtfs-generator.sh

--- a/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch
+++ b/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch
@ -50,7 +50,7 @@ command.
 Conflicts:
 	lsinitrd.sh
 ---
- lsinitrd.sh | 60 ++++++++++++++++++++++++++++--------------------------------
+ lsinitrd.sh | 60 +++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

 diff --git a/lsinitrd.sh b/lsinitrd.sh
--- a/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch
+++ b/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch
@ -4,13 +4,13 @@ Date: Mon, 4 Jul 2016 11:31:49 +0200
 Subject: [PATCH] network: support multiple vlan, team, bridge and bond

 ---
- modules.d/40network/ifup.sh         | 386 +++++++++++++++++-------------------
- modules.d/40network/net-genrules.sh |  27 ++-
+ modules.d/40network/ifup.sh         | 386 ++++++++++++++--------------
+ modules.d/40network/net-genrules.sh |  27 +-
 modules.d/40network/net-lib.sh      |   9 +-
 modules.d/40network/parse-bridge.sh |  30 +--
- modules.d/40network/parse-team.sh   |  47 ++---
- modules.d/40network/parse-vlan.sh   |  27 +--
- modules.d/45ifcfg/write-ifcfg.sh    |  26 +--
+ modules.d/40network/parse-team.sh   |  47 +---
+ modules.d/40network/parse-vlan.sh   |  27 +-
+ modules.d/45ifcfg/write-ifcfg.sh    |  26 +-
 7 files changed, 254 insertions(+), 298 deletions(-)

 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
--- a/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch
+++ b/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch
@ -7,17 +7,17 @@ multiple bonds
 multiple bridges
 multiple vlans
 ---
- .../99-idesymlinks.rules                           |   8 +
- test/TEST-70-BONDBRIDGETEAMVLAN/Makefile           |  10 +
- test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh     |  22 ++
- test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf         |  27 ++
- test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd2.conf        |  15 +
- test/TEST-70-BONDBRIDGETEAMVLAN/exports            |   1 +
- test/TEST-70-BONDBRIDGETEAMVLAN/finished-false.sh  |   2 +
- test/TEST-70-BONDBRIDGETEAMVLAN/hard-off.sh        |   3 +
- test/TEST-70-BONDBRIDGETEAMVLAN/hosts              |   5 +
- test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh     | 117 ++++++++
- test/TEST-70-BONDBRIDGETEAMVLAN/test.sh            | 308 +++++++++++++++++++++
+ .../99-idesymlinks.rules                      |   8 +
+ test/TEST-70-BONDBRIDGETEAMVLAN/Makefile      |  10 +
+ .../TEST-70-BONDBRIDGETEAMVLAN/client-init.sh |  22 ++
+ test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf    |  27 ++
+ test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd2.conf   |  15 +
+ test/TEST-70-BONDBRIDGETEAMVLAN/exports       |   1 +
+ .../finished-false.sh                         |   2 +
+ test/TEST-70-BONDBRIDGETEAMVLAN/hard-off.sh   |   3 +
+ test/TEST-70-BONDBRIDGETEAMVLAN/hosts         |   5 +
+ .../TEST-70-BONDBRIDGETEAMVLAN/server-init.sh | 117 +++++++
+ test/TEST-70-BONDBRIDGETEAMVLAN/test.sh       | 308 ++++++++++++++++++
 11 files changed, 518 insertions(+)
 create mode 100644 test/TEST-70-BONDBRIDGETEAMVLAN/99-idesymlinks.rules
 create mode 100644 test/TEST-70-BONDBRIDGETEAMVLAN/Makefile
--- a/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch
+++ b/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch
@ -9,7 +9,7 @@ Subject: [PATCH] watchdog/module-setup.sh: rewrite
 - follow device path until /sys is reached
 - set kernel version for modprobe checking
 ---
- modules.d/04watchdog/module-setup.sh | 92 ++++++++++++++++++++----------------
+ modules.d/04watchdog/module-setup.sh | 92 +++++++++++++++-------------
 1 file changed, 51 insertions(+), 41 deletions(-)

 diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
--- 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
@ -72,7 +72,7 @@ in the following patch.

 Signed-off-by: Xunlei Pang <xlpang@redhat.com>
 ---
- modules.d/99base/memtrace-ko.sh | 191 ++++++++++++++++++++++++++++++++++++++++
+ modules.d/99base/memtrace-ko.sh | 191 ++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100755 modules.d/99base/memtrace-ko.sh

--- a/SOURCES/0510-Add-NTFS-support-to-90dmsquash-live-module.patch
+++ b/SOURCES/0510-Add-NTFS-support-to-90dmsquash-live-module.patch
@ -9,8 +9,8 @@ squashfs.img (and any other file on the same USB media).

 Backports 37437cac8a1f2c411ead5fca28fb743a6f36f912 from dracut 046
 ---
- modules.d/90dmsquash-live-ntfs/module-setup.sh  | 22 ++++++++++++++++++++++
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 15 ++++++++++++++-
+ .../90dmsquash-live-ntfs/module-setup.sh      | 22 +++++++++++++++++++
+ .../90dmsquash-live/dmsquash-live-root.sh     | 15 ++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100755 modules.d/90dmsquash-live-ntfs/module-setup.sh

--- a/SOURCES/0511-add-90multipath-hostonly-module.patch
+++ b/SOURCES/0511-add-90multipath-hostonly-module.patch
@ -12,8 +12,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1457311
 Cherry-picked from: 5ce7cc7337a4c769b223152c083914f2052aa348
 Resolves: #1457311
 ---
- modules.d/90multipath-hostonly/module-setup.sh | 53 ++++++++++++++++++++++++++
- modules.d/90multipath/module-setup.sh          | 26 -------------
+ .../90multipath-hostonly/module-setup.sh      | 53 +++++++++++++++++++
+ modules.d/90multipath/module-setup.sh         | 26 ---------
 2 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100755 modules.d/90multipath-hostonly/module-setup.sh

--- a/SOURCES/0538-dracut-functions.sh-check_vol_slaves-speedup-LV-VG-n.patch
+++ b/SOURCES/0538-dracut-functions.sh-check_vol_slaves-speedup-LV-VG-n.patch
@ -12,7 +12,7 @@ This should speedup execution with lots of LVs.
 Cherry-picked from: 9ed6eb741
 Resolves: #1531503
 ---
- dracut-functions.sh | 62 +++++++++++++++++++++++++----------------------------
+ dracut-functions.sh | 62 +++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

 diff --git a/dracut-functions.sh b/dracut-functions.sh
--- a/SOURCES/0544-mdraid-wait-for-rd.md.uuid-specified-devices-to-be-a.patch
+++ b/SOURCES/0544-mdraid-wait-for-rd.md.uuid-specified-devices-to-be-a.patch
@ -14,7 +14,7 @@ Fixes https://github.com/dracutdevs/dracut/issues/227
 Cherry-picked from: 3cea0658
 Resolves: #1451660
 ---
- modules.d/90mdraid/mdraid_start.sh | 74 +++++++++++++++++++++++++++-----------
+ modules.d/90mdraid/mdraid_start.sh | 74 ++++++++++++++++++++++--------
 modules.d/90mdraid/parse-md.sh     |  3 ++
 2 files changed, 57 insertions(+), 20 deletions(-)

--- a/SOURCES/0550-Revert-add-90multipath-hostonly-module.patch
+++ b/SOURCES/0550-Revert-add-90multipath-hostonly-module.patch
@ -8,8 +8,8 @@ This reverts commit 6ef3173e86c2be99b504f7c7a789dea5c0072f64.
 Cherry-picked from: 35e86ac117acbfd699f371f163cdda9db0ebc047
 Resolves: #1599592
 ---
- modules.d/90multipath-hostonly/module-setup.sh | 53 --------------------------
- modules.d/90multipath/module-setup.sh          | 26 +++++++++++++
+ .../90multipath-hostonly/module-setup.sh      | 53 -------------------
+ modules.d/90multipath/module-setup.sh         | 26 +++++++++
 2 files changed, 26 insertions(+), 53 deletions(-)
 delete mode 100755 modules.d/90multipath-hostonly/module-setup.sh

--- a/SOURCES/0554-added-make-rpm-srpm-options.patch
+++ b/SOURCES/0554-added-make-rpm-srpm-options.patch
@ -0,0 +1,47 @@
+From d76ccd07bc7d2d30ab2df38e9ae444766662c639 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Tue, 5 Feb 2019 15:18:08 +0100
+Subject: [PATCH] added make rpm/srpm options
+
+---
+ Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2977d187..43390405 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,6 +1,6 @@
+ -include dracut-version.sh
+ 
+-VERSION = $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
+VERSION = $(shell [ -d .git ] && git describe --abbrev=0 2>/dev/null || echo $(DRACUT_VERSION))
+ GITVERSION = $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
+ 
+ -include Makefile.inc
+@@ -39,7 +39,7 @@ man8pages = dracut.8 \
+ 
+ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
+ 
+-.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
+.PHONY: install clean archive rpm srpm testimage test all check AUTHORS doc dracut-version.sh
+ 
+ all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio
+ 
+@@ -202,6 +202,16 @@ rpm: dracut-$(VERSION).tar.bz2 syncheck
+ 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
+ 	( mv "$$rpmbuild"/$$(arch)/*.rpm $(DESTDIR).; mv "$$rpmbuild"/*.src.rpm $(DESTDIR).;rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
+ 
+srpm: dracut-$(VERSION).tar.bz2 syncheck
+	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+	(cd "$$rpmbuild"; \
+	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+		--define "_rpmdir $$PWD" -bs dracut.spec; ) && \
+	( 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 \
+                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
--- a/SOURCES/0555-fips-check-fips-integrity-just-before-mounting-local.patch
+++ b/SOURCES/0555-fips-check-fips-integrity-just-before-mounting-local.patch
@ -0,0 +1,30 @@
+From 75d6e4366a9de82c4d87841c99e00c90d333b0ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Fri, 19 Oct 2018 13:21:37 +0200
+Subject: [PATCH] fips: check fips integrity just before mounting local
+ filesystems in /sysroot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+
+Cherry-picked from: e54ab383f7529f340d69536709624dffb30046a1
+Resolves: #1640981
+---
+ 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 ff72bb9b..242d4dd9 100755
+--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
+@@ -40,7 +40,7 @@ installkernel() {
+ 
+ install() {
+     local _dir
+-    inst_hook pre-trigger 01 "$moddir/fips-boot.sh"
+    inst_hook pre-mount 01 "$moddir/fips-boot.sh"
+     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
+     inst_script "$moddir/fips.sh" /sbin/fips.sh
+ 
--- a/SOURCES/0556-Harden-dracut-against-BASH_ENV-environment-variable.patch
+++ b/SOURCES/0556-Harden-dracut-against-BASH_ENV-environment-variable.patch
@ -0,0 +1,43 @@
+From fc87cf0e7e9790fb7c02ee54a73dd474ffa6fa38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Thu, 7 Jun 2018 15:42:12 +0200
+Subject: [PATCH] Harden dracut against BASH_ENV environment variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When dracut silently produces a broken initramfs, then the system will
+likely not boot and this can be very problematic. Typical use case is
+after the kernel has been updated.
+
+It appears that dracut is not protected against the BASH_ENV variable,
+causing various scripts called by dracut to possibly fail or provide
+wrong output (e.g. "ldd" is one of these).
+Having a broken output for "ldd" makes the generated initramfs be not
+usable, typically because vital binaries will be missing (e.g.
+"awk", "udevadm", ...).
+
+Note: because the shebang line cannot contain more than one argument,
+the '--norc' option had to be removed. IMHO, it was useless anyway.
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+
+Cherry-picked from: c1c78f8a91921fe87f5672cdbdf9791f569fc8ac
+Resolves: #1588483
+---
+ dracut.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dracut.sh b/dracut.sh
+index 52835872..27489528 100755
+--- a/dracut.sh
+++ b/dracut.sh
+@@ -23,6 +23,8 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+unset BASH_ENV
+
+ # store for logging
+ dracut_args=( "$@" )
+ 
--- a/SOURCES/0557-iscsi-always-popd-even-if-there-is-no-iscsi-device.patch
+++ b/SOURCES/0557-iscsi-always-popd-even-if-there-is-no-iscsi-device.patch
@ -0,0 +1,27 @@
+From 97dd467e8e5996c512584123a762a7c9f12e5e86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Fri, 1 Mar 2019 11:46:43 +0100
+Subject: [PATCH] iscsi: always popd, even if there is no iscsi device
+
+Cherry-picked from: 33cfad0b8f31a8241003b8f7728a2dc1ef61ca41
+Resolves: #1684474
+---
+ modules.d/95iscsi/module-setup.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
+index b1f5c6cb..432c8cb2 100755
+--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
+@@ -23,8 +23,10 @@ check() {
+ 
+     [[ $hostonly ]] || [[ $mount_needs ]] && {
+         pushd . >/dev/null
+-        for_each_host_dev_and_slaves is_iscsi || return 255
+        for_each_host_dev_and_slaves is_iscsi
+        local _is_iscsi=$?
+         popd >/dev/null
+        [[ $_is_iscsi == 0 ]] || return 255
+     }
+     return 0
+ }
--- a/SOURCES/0558-fips-ensure-fs-module-for-boot-is-installed.patch
+++ b/SOURCES/0558-fips-ensure-fs-module-for-boot-is-installed.patch
@ -0,0 +1,53 @@
+From c6ccef8827af134884c5b2c785e07eb0b144450b Mon Sep 17 00:00:00 2001
+From: Kairui Song <kasong@redhat.com>
+Date: Thu, 14 Mar 2019 18:54:10 +0800
+Subject: [PATCH] fips: ensure fs module for /boot is installed
+
+When using dracut with  --hostonly and --no-hostonly-default-device,
+/boot will be inaccessible as dracut will most fs modules unless
+specified. But FIPS require /boot to be accessible, and it will try
+to mount it on boot. It will fail if corresponding fs module is missing.
+
+For most case /boot will be a simple partition, include the fs module
+will be enough for FIPS to mount it. For other cases users have to pass
+extra parameters by themselves.
+
+Suggested-by: Kenneth Dsouza <kdsouza@redhat.com>
+Signed-off-by: Kairui Song <kasong@redhat.com>
+
+Cherry-picked from: 8365177644bee107dcb66a71c8a7509900c9ece4
+Resolves: #1672817
+---
+ modules.d/01fips/module-setup.sh | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 242d4dd9..834e7d7d 100755
+--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
+@@ -11,7 +11,7 @@ depends() {
+ }
+ 
+ installkernel() {
+-    local _fipsmodules _mod i
+    local _fipsmodules _mod i _bootfstype
+ 
+     if [[ -f "${srcmods}/modules.fips" ]]; then
+         _fipsmodules="$(cat "${srcmods}/modules.fips")"
+@@ -36,6 +36,16 @@ installkernel() {
+             done
+         fi
+     done
+
+    # with hostonly_default_device fs module for /boot is not installed by default
+    if [[ $hostonly ]] && [[ "$hostonly_default_device" == "no" ]]; then
+        _bootfstype=$(find_mp_fstype /boot)
+        if [[ -n "$_bootfstype" ]]; then
+            hostonly='' instmods $_bootfstype
+        else
+            dwarning "Can't determine fs type for /boot, FIPS check may fail."
+        fi
+    fi
+ }
+ 
+ install() {
--- a/SOURCES/0559-fips-removed-false-positive-FATAL-Module-xxx-not-fou.patch
+++ b/SOURCES/0559-fips-removed-false-positive-FATAL-Module-xxx-not-fou.patch
@ -0,0 +1,39 @@
+From 2ee1e96e1a2bd37cfb9a70e924fd93d709939979 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Wed, 14 Nov 2018 13:19:27 +0100
+Subject: [PATCH] fips: removed false-positive 'FATAL: Module xxx not found'
+ error message when kernel provides a generic algo for module
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+
+Cherry-picked from: 01ffcf342ae65984c655f10a2fd35019a492ee5c
+Resolves: #1649743
+---
+ modules.d/01fips/fips.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index c72c1273..7ba1ab27 100755
+--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
+@@ -86,7 +86,7 @@ do_fips()
+     mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
+     for _module in $FIPSMODULES; do
+         if [ "$_module" != "tcrypt" ]; then
+-            if ! modprobe "${_module}"; then
+            if ! modprobe "${_module}" 2>/tmp/fips.modprobe_err; then
+                 # check if kernel provides generic algo
+                 _found=0
+                 while read _k _s _v; do
+@@ -95,7 +95,7 @@ do_fips()
+                     _found=1
+                     break
+                 done </proc/crypto
+-                [ "$_found" = "0" ] && return 1
+                [ "$_found" = "0" ] && cat /tmp/fips.modprobe_err >&2 && return 1
+             fi
+         fi
+     done
--- a/SOURCES/0560-95iscsi-iscsiroot-synchronously-wait-until-iscsistar.patch
+++ b/SOURCES/0560-95iscsi-iscsiroot-synchronously-wait-until-iscsistar.patch
@ -0,0 +1,26 @@
+From 937b808a0d71b68a3285cf3e9d162b0060c5bcdf Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Mon, 1 Apr 2019 17:25:01 +0200
+Subject: [PATCH] 95iscsi/iscsiroot: synchronously wait until iscsistart
+ finishes
+
+---
+ modules.d/95iscsi/iscsiroot.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index c93ff068..e94f596b 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
+@@ -197,6 +197,11 @@ handle_netroot()
+ 	                    ${iscsi_netdev_name:+--param "iface.net_ifacename=$iscsi_netdev_name"} \
+                             ${iscsi_param} >/dev/null 2>&1 \
+ 	            && { > $hookdir/initqueue/work ; }
+                while : ; do
+                    status=$(systemctl is-active "$netroot_enc" 2>/dev/null)
+                    [ "$status" != "activating" ] && break
+                    sleep 1
+                done
+             else
+                 systemctl --no-block restart "$netroot_enc" >/dev/null 2>&1 \
+ 	            && { > $hookdir/initqueue/work ; }
--- a/SOURCES/0561-rootfs-generator-rebase-to-upstream-version.patch
+++ b/SOURCES/0561-rootfs-generator-rebase-to-upstream-version.patch
@ -0,0 +1,131 @@
+From e42ab58a70ae646d09c319c125154e970e25a994 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 25 Apr 2019 10:11:58 +0200
+Subject: [PATCH] rootfs-generator: rebase to upstream version
+
+Resolves: #1640866
+---
+ modules.d/98systemd/rootfs-generator.sh | 87 ++++++++++++++++++++-----
+ 1 file changed, 70 insertions(+), 17 deletions(-)
+
+diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh
+index a7bffdfd..4ae693bb 100755
+--- a/modules.d/98systemd/rootfs-generator.sh
+++ b/modules.d/98systemd/rootfs-generator.sh
+@@ -1,6 +1,4 @@
+ #!/bin/sh
+-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+-# ex: ts=8 sw=4 sts=4 et filetype=sh
+ 
+ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+ 
+@@ -10,32 +8,81 @@ generator_wait_for_dev()
+     local _timeout
+ 
+     _name="$(str_replace "$1" '/' '\x2f')"
+    _timeout=$(getarg rd.timeout)
+    _timeout=${_timeout:-0}
+ 
+-    [ -e "$hookdir/initqueue/finished/devexists-${_name}.sh" ] && return 0
+    if ! [ -e "$hookdir/initqueue/finished/devexists-${_name}.sh" ]; then
+ 
+-    printf '[ -e "%s" ]\n' $1 \
+-        >> "$hookdir/initqueue/finished/devexists-${_name}.sh"
+-    {
+-        printf '[ -e "%s" ] || ' $1
+-        printf 'warn "\"%s\" does not exist"\n' $1
+-    } >> "$hookdir/emergency/80-${_name}.sh"
+        printf '[ -e "%s" ]\n' $1 \
+            >> "$hookdir/initqueue/finished/devexists-${_name}.sh"
+        {
+            printf '[ -e "%s" ] || ' $1
+            printf 'warn "\"%s\" does not exist"\n' $1
+        } >> "$hookdir/emergency/80-${_name}.sh"
+    fi
+ 
+     _name=$(dev_unit_name "$1")
+-    if ! [ -L /run/systemd/generator/initrd.target.wants/${_name}.device ]; then
+-        [ -d /run/systemd/generator/initrd.target.wants ] || mkdir -p /run/systemd/generator/initrd.target.wants
+-        ln -s ../${_name}.device /run/systemd/generator/initrd.target.wants/${_name}.device
+    if ! [ -L "$GENERATOR_DIR"/initrd.target.wants/${_name}.device ]; then
+        [ -d "$GENERATOR_DIR"/initrd.target.wants ] || mkdir -p "$GENERATOR_DIR"/initrd.target.wants
+        ln -s ../${_name}.device "$GENERATOR_DIR"/initrd.target.wants/${_name}.device
+     fi
+ 
+-    if ! [ -f /run/systemd/generator/${_name}.device.d/timeout.conf ]; then
+-        _timeout=$(getarg rd.device.timeout || printf "0")
+-        mkdir -p /run/systemd/generator/${_name}.device.d
+    if ! [ -f "$GENERATOR_DIR"/${_name}.device.d/timeout.conf ]; then
+        mkdir -p "$GENERATOR_DIR"/${_name}.device.d
+         {
+             echo "[Unit]"
+             echo "JobTimeoutSec=$_timeout"
+-        } > /run/systemd/generator/${_name}.device.d/timeout.conf
+            echo "JobRunningTimeoutSec=$_timeout"
+        } > "$GENERATOR_DIR"/${_name}.device.d/timeout.conf
+    fi
+}
+
+generator_mount_rootfs()
+{
+    local _type=$2
+    local _flags=$3
+    local _name
+
+    [ -z "$1" ] && return 0
+
+    _name=$(dev_unit_name "$1")
+    [ -d "$GENERATOR_DIR" ] || mkdir -p "$GENERATOR_DIR"
+    if ! [ -f "$GENERATOR_DIR"/sysroot.mount ]; then
+        {
+            echo "[Unit]"
+            echo "Before=initrd-root-fs.target"
+            echo "Requires=systemd-fsck@${_name}.service"
+            echo "After=systemd-fsck@${_name}.service"
+            echo "[Mount]"
+            echo "Where=/sysroot"
+            echo "What=$1"
+            echo "Options=${_flags}"
+            echo "Type=${_type}"
+        } > "$GENERATOR_DIR"/sysroot.mount
+    fi
+    if ! [ -L "$GENERATOR_DIR"/initrd-root-fs.target.requires/sysroot.mount ]; then
+        [ -d "$GENERATOR_DIR"/initrd-root-fs.target.requires ] || mkdir -p "$GENERATOR_DIR"/initrd-root-fs.target.requires
+        ln -s ../sysroot.mount "$GENERATOR_DIR"/initrd-root-fs.target.requires/sysroot.mount
+     fi
+ }
+ 
+generator_fsck_after_pre_mount()
+{
+    local _name
+
+    [ -z "$1" ] && return 0
+
+    _name=$(dev_unit_name "$1")
+    [ -d /run/systemd/generator/systemd-fsck@${_name}.service.d ] || mkdir -p /run/systemd/generator/systemd-fsck@${_name}.service.d
+    if ! [ -f /run/systemd/generator/systemd-fsck@${_name}.service.d/after-pre-mount.conf ]; then
+        {
+            echo "[Unit]"
+            echo "After=dracut-pre-mount.service"
+        } > /run/systemd/generator/systemd-fsck@${_name}.service.d/after-pre-mount.conf
+    fi
+
+}
+
+ root=$(getarg root=)
+ case "$root" in
+     block:LABEL=*|LABEL=*)
+@@ -62,6 +109,12 @@ case "$root" in
+         rootok=1 ;;
+ esac
+ 
+-[ "${root%%:*}" = "block" ] && generator_wait_for_dev "${root#block:}"
+GENERATOR_DIR="$1"
+
+if [ "$rootok" = "1"  ]; then
+   generator_wait_for_dev "${root#block:}" "$RDRETRY"
+   generator_fsck_after_pre_mount "${root#block:}"
+   strstr "$(cat /proc/cmdline)" 'root=' || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)"
+fi
+ 
+ exit 0
--- a/SOURCES/0562-fips-split-loading-the-crypto-modules-and-checking-t.patch
+++ b/SOURCES/0562-fips-split-loading-the-crypto-modules-and-checking-t.patch
@ -0,0 +1,86 @@
+From 65623826c102b0cbcd04774d55dc28388e9c942c Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Tue, 14 May 2019 09:23:55 +0200
+Subject: [PATCH] fips: split loading the crypto modules and checking the
+ kernel
+
+In e54ab383 we moved the fips script to a later pahse of boot, since
+the /boot might not be available early on.
+
+The problem is that systemd-cryptsetup* services could be run now
+started before the do_fips is executed and need the crypto modules
+to decrypted the devices.
+
+So let's split the do_fips and load the module before udev does the
+trigger.
+---
+ modules.d/01fips/fips-load-crypto.sh |  8 ++++++++
+ modules.d/01fips/fips.sh             | 19 +++++++++++--------
+ modules.d/01fips/module-setup.sh     |  1 +
+ 3 files changed, 20 insertions(+), 8 deletions(-)
+ create mode 100644 modules.d/01fips/fips-load-crypto.sh
+
+diff --git a/modules.d/01fips/fips-load-crypto.sh b/modules.d/01fips/fips-load-crypto.sh
+new file mode 100644
+index 00000000..82cbeee4
+--- /dev/null
+++ b/modules.d/01fips/fips-load-crypto.sh
+@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
+else
+    . /sbin/fips.sh
+    fips_load_crypto || die "FIPS integrity test failed"
+fi
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index 7ba1ab27..642fafbe 100755
+--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
+@@ -71,15 +71,8 @@ do_rhevh_check()
+     return 0
+ }
+ 
+-do_fips()
+fips_load_crypto()
+ {
+-    local _v
+-    local _s
+-    local _v
+-    local _module
+-
+-    KERNEL=$(uname -r)
+-
+     FIPSMODULES=$(cat /etc/fipsmodules)
+ 
+     info "Loading and integrity checking all crypto modules"
+@@ -104,6 +97,16 @@ do_fips()
+     info "Self testing crypto algorithms"
+     modprobe tcrypt || return 1
+     rmmod tcrypt
+}
+
+do_fips()
+{
+    local _v
+    local _s
+    local _v
+    local _module
+
+    KERNEL=$(uname -r)
+ 
+     info "Checking integrity of kernel"
+     if [ -e "/run/initramfs/live/vmlinuz0" ]; then
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 834e7d7d..306f3ada 100755
+--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
+@@ -52,6 +52,7 @@ install() {
+     local _dir
+     inst_hook pre-mount 01 "$moddir/fips-boot.sh"
+     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
+    inst_hook pre-udev 01 "$moddir/fips-load-crypto.sh"
+     inst_script "$moddir/fips.sh" /sbin/fips.sh
+ 
+     inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck
--- a/SOURCES/0563-network-skip-already-enslaved-interfaces.patch
+++ b/SOURCES/0563-network-skip-already-enslaved-interfaces.patch
@ -0,0 +1,50 @@
+From e8a7c2a15215f73fff10358af7d9ecd0ab7b597f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 21 Aug 2018 13:14:44 +0200
+Subject: [PATCH] network: skip already enslaved interfaces
+
+---
+ modules.d/40network/ifup.sh    | 11 +++++++----
+ modules.d/40network/net-lib.sh |  7 +++++++
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index b3631648..181ab67c 100755
+--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
+@@ -377,10 +377,13 @@ for p in $(getargs ip=); do
+     esac
+ 
+     # If this option isn't directed at our interface, skip it
+-    [ -n "$dev" ] && [ "$dev" != "$netif" ] && \
+-    [ "$use_bridge" != 'true' ] && \
+-    [ "$use_vlan" != 'true' ] && continue
+-
+    if [ -n "$dev" ]; then
+        [ "$dev" != "$netif" ] && \
+        [ "$use_bridge" != 'true' ] && \
+        [ "$use_vlan" != 'true' ] && continue
+    else
+        iface_is_enslaved "$netif" && continue
+    fi
+     # Store config for later use
+     for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
+         eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 9e87aeab..35e6e833 100755
+--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
+@@ -731,6 +731,13 @@ iface_has_link() {
+     iface_has_carrier "$@"
+ }
+ 
+iface_is_enslaved() {
+    local _li
+    _li=$(ip -o link show dev $1)
+    strstr "$li" " master " || return 1
+    return 0
+}
+
+ find_iface_with_link() {
+     local iface_path="" iface=""
+     for iface_path in /sys/class/net/*; do
--- a/SOURCES/0564-rootfs-generator-don-t-set-JobRunningTimeoutSec.patch
+++ b/SOURCES/0564-rootfs-generator-don-t-set-JobRunningTimeoutSec.patch
@ -0,0 +1,22 @@
+From 6193b3a6e28e81fe0ebbdba4ca6aaff70b63695f Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 29 Aug 2019 09:40:09 +0200
+Subject: [PATCH] rootfs-generator: don't set JobRunningTimeoutSec
+
+We don't have that in rhel7 systemd
+---
+ modules.d/98systemd/rootfs-generator.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh
+index 4ae693bb..eada3d15 100755
+--- a/modules.d/98systemd/rootfs-generator.sh
+++ b/modules.d/98systemd/rootfs-generator.sh
+@@ -32,7 +32,6 @@ generator_wait_for_dev()
+         {
+             echo "[Unit]"
+             echo "JobTimeoutSec=$_timeout"
+-            echo "JobRunningTimeoutSec=$_timeout"
+         } > "$GENERATOR_DIR"/${_name}.device.d/timeout.conf
+     fi
+ }
--- a/SOURCES/0565-Sync-initramfs-after-creation.patch
+++ b/SOURCES/0565-Sync-initramfs-after-creation.patch
@ -0,0 +1,29 @@
+From 1126a69746b6e0625d4a8db3b246a3edb7c5f551 Mon Sep 17 00:00:00 2001
+From: Ankit Kumar <ankit@linux.vnet.ibm.com>
+Date: Mon, 7 Aug 2017 12:13:53 +0530
+Subject: [PATCH] Sync initramfs after creation
+
+If we trigger crash just after creating initramfs, sometimes it is
+observed that initramfs is not written to disk causing the subsequent
+boot to fail. A sync should resolve this.
+
+Signed-off-by: Ankit Kumar <ankit@linux.vnet.ibm.com>
+---
+ dracut.sh | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/dracut.sh b/dracut.sh
+index 27489528..9df63cd7 100755
+--- a/dracut.sh
+++ b/dracut.sh
+@@ -1704,4 +1704,10 @@ else
+     exit 1
+ fi
+ 
+sync $outfile 2> /dev/null
+if [ $? -ne 0 ] ; then
+    dinfo "dracut: sync operartion on newly created initramfs $outfile failed"
+    exit 1
+fi
+
+ exit 0
--- a/SOURCES/0566-dracut.sh-quote-sync-file-argument.patch
+++ b/SOURCES/0566-dracut.sh-quote-sync-file-argument.patch
@ -0,0 +1,24 @@
+From 57c3103a6907fecab002f6d20b0410ad9a1b9f94 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 11 Oct 2017 15:28:20 +0200
+Subject: [PATCH] dracut.sh: quote sync file argument
+
+---
+ dracut.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 9df63cd7..62e53b73 100755
+--- a/dracut.sh
+++ b/dracut.sh
+@@ -1704,8 +1704,8 @@ else
+     exit 1
+ fi
+ 
+-sync $outfile 2> /dev/null
+-if [ $? -ne 0 ] ; then
+
+if ! sync "$outfile" 2> /dev/null; then
+     dinfo "dracut: sync operartion on newly created initramfs $outfile failed"
+     exit 1
+ fi
--- a/SOURCES/0567-net-lib-check-if-addr-exists-before-checking-for-dad.patch
+++ b/SOURCES/0567-net-lib-check-if-addr-exists-before-checking-for-dad.patch
@ -0,0 +1,35 @@
+From 6b827761075266ebaf1ef10cc0a640445f02dbe1 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Mon, 7 Oct 2019 16:48:09 +0200
+Subject: [PATCH] net-lib: check if addr exists before checking for dad state
+
+Before we check if dad is done we should first make sure,
+that there is a link local address where we do the check.
+
+Due to this issue, on ipv6 only setups sometimes dhclient started
+asking for ip address, before the link local address was present
+and failed immediately.
+---
+ modules.d/40network/net-lib.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 35e6e833..3f2fc712 100755
+--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
+@@ -645,6 +645,7 @@ wait_for_ipv6_dad_link() {
+     timeout=$(($timeout*10))
+ 
+     while [ $cnt -lt $timeout ]; do
+        [ -n "$(ip -6 addr show dev "$1" scope link)" ] \
+         [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \
+             && return 0
+         [ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \
+@@ -662,6 +663,7 @@ wait_for_ipv6_dad() {
+     timeout=$(($timeout*10))
+ 
+     while [ $cnt -lt $timeout ]; do
+        [ -n "$(ip -6 addr show dev "$1")" ] \
+         [ -z "$(ip -6 addr show dev "$1" tentative)" ] \
+             && return 0
+         [ -n "$(ip -6 addr show dev "$1" dadfailed)" ] \
--- a/SOURCES/0568-netlib-fix-botched-backport.patch
+++ b/SOURCES/0568-netlib-fix-botched-backport.patch
@ -0,0 +1,31 @@
+From 256f9a3f37ea33b94692303dfe10141a333cd744 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Mon, 18 May 2020 14:47:04 +0200
+Subject: [PATCH] netlib: fix botched backport
+
+---
+ modules.d/40network/net-lib.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 3f2fc712..3c08a603 100755
+--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
+@@ -646,7 +646,7 @@ wait_for_ipv6_dad_link() {
+ 
+     while [ $cnt -lt $timeout ]; do
+         [ -n "$(ip -6 addr show dev "$1" scope link)" ] \
+-        [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \
+            && [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \
+             && return 0
+         [ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \
+             && return 1
+@@ -664,7 +664,7 @@ wait_for_ipv6_dad() {
+ 
+     while [ $cnt -lt $timeout ]; do
+         [ -n "$(ip -6 addr show dev "$1")" ] \
+-        [ -z "$(ip -6 addr show dev "$1" tentative)" ] \
+            && [ -z "$(ip -6 addr show dev "$1" tentative)" ] \
+             && return 0
+         [ -n "$(ip -6 addr show dev "$1" dadfailed)" ] \
+             && return 1
--- a/SOURCES/0569-dracut.sh-disable-lsinitrd-logging-when-quiet.patch
+++ b/SOURCES/0569-dracut.sh-disable-lsinitrd-logging-when-quiet.patch
@ -0,0 +1,58 @@
+From df58ab6257ff2c688432d3cde159538419f85769 Mon Sep 17 00:00:00 2001
+From: Ziyue Yang <ziyang@redhat.com>
+Date: Wed, 23 Aug 2017 11:23:34 +0800
+Subject: [PATCH] dracut.sh: disable lsinitrd logging when quiet
+
+Currently in Fedora/RedHat dracut installs its fedora.conf.example
+as the default config file, in which sysloglvl is set 5. This leads
+to maxloglvl=5 in dracut calls, making unnecessary lsinitrd calls
+during initramfs builds by kdump.
+
+This patch disables lsinitrd logging when --quiet option is given,
+which is controlled by maxloglvl only before. This will speed up
+dracut image building as the following if --quiet is used in kdump:
+
+1) Before this patch
+$ kdumpctl stop; touch /etc/kdump.conf; time kdumpctl start
+kexec: unloaded kdump kernel
+Stopping kdump: [OK]
+Detected change(s) in the following file(s):
+  /etc/kdump.conf
+Rebuilding /boot/initramfs-4.13.0-0.rc1.git4.1.fc27.x86_64kdump.img
+kexec: loaded kdump kernel
+Starting kdump: [OK]
+real    0m26.824s
+user    0m9.958s
+sys     0m15.106s
+
+2) After this patch
+$ kdumpctl stop; touch /etc/kdump.conf; time kdumpctl start
+kexec: unloaded kdump kernel
+Stopping kdump: [OK]
+Detected change(s) in the following file(s):
+  /etc/kdump.conf
+Rebuilding /boot/initramfs-4.13.0-0.rc1.git4.1.fc27.x86_64kdump.img
+kexec: loaded kdump kernel
+Starting kdump: [OK]
+real    0m20.420s
+user    0m8.385s
+sys     0m10.468s
+
+Signed-off-by: Ziyue Yang <ziyang@redhat.com>
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 62e53b73..d7459d06 100755
+--- a/dracut.sh
+++ b/dracut.sh
+@@ -1688,7 +1688,7 @@ fi
+ 
+ dinfo "*** Creating image file done ***"
+ 
+-if (( maxloglvl >= 5 )); then
+if (( maxloglvl >= 5 )) && (( verbosity_mod_l >= 0 )); then
+     if [[ $allowlocal ]]; then
+ 	"$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img" | ddebug
+     else
--- a/SOURCES/0570-Drop-dependency-on-bridge-utils.patch
+++ b/SOURCES/0570-Drop-dependency-on-bridge-utils.patch
@ -0,0 +1,53 @@
+From ba25b54c7eaa65c53cc81df1d0ee8c1439e501a8 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Tue, 14 Feb 2017 12:51:18 +0100
+Subject: [PATCH] Drop dependency on bridge-utils
+
+---
+ README.testsuite                    | 1 -
+ modules.d/40network/ifup.sh         | 6 +++---
+ modules.d/40network/module-setup.sh | 1 -
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/README.testsuite b/README.testsuite
+index 247ed3aa..fc2ee209 100644
+--- a/README.testsuite
+++ b/README.testsuite
+@@ -1,6 +1,5 @@
+ For the testsuite to work, you will have to install at least the following software packages:
+ dash \
+-bridge-utils \
+ asciidoc \
+ mdadm \
+ lvm2 \
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 181ab67c..47ec2df6 100755
+--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
+@@ -187,11 +187,11 @@ if [ -z "$NO_BRIDGE_MASTER" ]; then
+             NO_BRIDGE_MASTER=yes NO_AUTO_DHCP=yes ifup $ethname
+             linkup $ethname
+             if [ ! -e /tmp/bridge.$bridgename.up ]; then
+-                brctl addbr $bridgename
+-                brctl setfd $bridgename 0
+                ip link add name $bridgename type bridge
+                echo 0 > /sys/devices/virtual/net/$bridgename/bridge/forward_delay
+                 > /tmp/bridge.$bridgename.up
+             fi
+-            brctl addif $bridgename $ethname
+            ip link set dev $ethname master $bridgename
+             ifup $bridgename
+             exit 0
+         done
+diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
+index de353674..4ead92fa 100755
+--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
+@@ -71,7 +71,6 @@ install() {
+     local _arch _i _dir
+     inst_multiple ip arping dhclient sed awk
+     inst_multiple -o ping ping6
+-    inst_multiple -o brctl
+     inst_multiple -o teamd teamdctl teamnl
+     inst_simple /etc/libnl/classid
+     inst_script "$moddir/ifup.sh" "/sbin/ifup"
--- a/SOURCES/0571-95znet-Add-a-rd.znet_ifname-option.patch
+++ b/SOURCES/0571-95znet-Add-a-rd.znet_ifname-option.patch
@ -0,0 +1,59 @@
+From 76ec341c5efbeb0c47ec28c518820c1b4beac2fa Mon Sep 17 00:00:00 2001
+From: Kairui Song <kasong@redhat.com>
+Date: Thu, 5 Mar 2020 18:44:45 +0800
+Subject: [PATCH] 95znet: Add a rd.znet_ifname= option
+
+qeth device may have a different IP for each boot, so the rd.ifname=
+option will no longer work. So for znet device, introduce a
+rd.znet_ifname= options, to subchannel id instead of MAC address as the
+identifier and rename the interface.
+
+Signed-off-by: Kairui Song <kasong@redhat.com>
+---
+ dracut.cmdline.7.asc          |  5 +++++
+ modules.d/95znet/parse-ccw.sh | 18 ++++++++++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
+index 1204aeb2..3c70c82d 100644
+--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
+@@ -762,6 +762,11 @@ ZNET
+ ~~~~
+ **rd.znet=**__<nettype>__,__<subchannels>__,__<options>__::
+     rd.znet can be specified multiple times on the kernel command line.
+
+**rd.znet_ifname=**__<ifname>__:__<subchannels>__::
+    Assign network device name <interface> (i.e. "bootnet") to the NIC
+    corresponds to the subchannels. This is useful when dracut's default
+    "ifname=" doesn't work due to device having a changing MAC address.
+ +
+ [listing]
+ .Example
+diff --git a/modules.d/95znet/parse-ccw.sh b/modules.d/95znet/parse-ccw.sh
+index cf1f41d4..c8085eda 100755
+--- a/modules.d/95znet/parse-ccw.sh
+++ b/modules.d/95znet/parse-ccw.sh
+@@ -6,4 +6,22 @@ for ccw_arg in $(getargs rd.ccw -d 'rd_CCW=') $(getargs rd.znet -d 'rd_ZNET=');
+     echo $ccw_arg >> /etc/ccw.conf
+ done
+ 
+for ifname in $(getargs rd.znet_ifname); do
+    IFS=: read ifname_if ifname_subchannels _rest <<< "$ifname"
+    if [ -z "$ifname_if" ] || [ -z "$ifname_subchannels" ] || [ -n "$_rest" ]; then
+        warn "Invalid arguments for rd.znet_ifname="
+    else
+        {
+            ifname_subchannels=${ifname_subchannels//,/|}
+
+            echo 'ACTION!="add|change", GOTO="ccw_ifname_end"'
+            echo 'ATTR{type}!="1", GOTO="ccw_ifname_end"'
+            echo 'SUBSYSTEM!="net", GOTO="ccw_ifname_end"'
+            echo "SUBSYSTEMS==\"ccwgroup\", KERNELS==\"$ifname_subchannels\", DRIVERS==\"?*\" NAME=\"$ifname_if\""
+            echo 'LABEL="ccw_ifname_end"'
+
+        } > /etc/udev/rules.d/81-ccw-ifname.rules
+    fi
+done
+
+ znet_cio_free