diff --git a/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch b/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch index 228a062..f0e196f 100644 --- a/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch +++ b/SOURCES/0001-dracut.sh-harden-host_modalias-reading.patch @@ -12,7 +12,7 @@ cat: /sys/devices/vio/4000/modalias: No such device 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index bd905e3..fd27846 100755 +index bd905e32..fd278466 100755 --- a/dracut.sh +++ b/dracut.sh @@ -921,7 +921,7 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch b/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch index 961e833..e704f26 100644 --- a/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch +++ b/SOURCES/0002-ifup-do-not-dhcp-on-network-interface-of-secondary-s.patch @@ -16,7 +16,7 @@ dhcp. Fix this issue with this patch. 1 file changed, 7 insertions(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 3261647..9f6f449 100755 +index 32616470..9f6f4494 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -336,6 +336,13 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch b/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch index 92b1a9d..001c384 100644 --- a/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch +++ b/SOURCES/0003-dracut.sh-also-search-uevent-s-for-MODALIAS.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: also search uevent's for MODALIAS 1 file changed, 8 insertions(+) diff --git a/dracut.sh b/dracut.sh -index fd27846..ce39151 100755 +index fd278466..ce39151c 100755 --- a/dracut.sh +++ b/dracut.sh @@ -923,6 +923,14 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch b/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch index d0dd111..bafd3de 100644 --- a/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch +++ b/SOURCES/0004-dracut.sh-we-don-t-need-to-read-the-modalias-files.patch @@ -10,7 +10,7 @@ modalias files would not trigger any module load. 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh -index ce39151..196b3ad 100755 +index ce39151c..196b3ad4 100755 --- a/dracut.sh +++ b/dracut.sh @@ -919,15 +919,12 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch b/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch index 3b86f32..92e0325 100644 --- a/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch +++ b/SOURCES/0005-Add-option-to-turn-on-off-prelinking.patch @@ -13,7 +13,7 @@ do_prelink=[yes|no] 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dracut.8.asc b/dracut.8.asc -index ee9d8de..76fc75c 100644 +index ee9d8de2..76fc75c4 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -269,6 +269,12 @@ example: @@ -30,7 +30,7 @@ index ee9d8de..76fc75c 100644 hardlink files in the initramfs (default) diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index a32516c..63991d4 100644 +index a32516c4..63991d4f 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -67,6 +67,9 @@ Configuration files must have the extension .conf; other extensions are ignored. @@ -44,7 +44,7 @@ index a32516c..63991d4 100644 Host-Only mode: Install only what is needed for booting the local host instead of a generic host and generate host-specific configuration. diff --git a/dracut.sh b/dracut.sh -index 196b3ad..177e66d 100755 +index 196b3ad4..177e66d5 100755 --- a/dracut.sh +++ b/dracut.sh @@ -97,6 +97,8 @@ Creates initial ramdisk images for preloading modules diff --git a/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch b/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch index 3ca5723..ba8a2a6 100644 --- a/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch +++ b/SOURCES/0006-add-etc-system-fips-for-dracut-fips-subpackage.patch @@ -8,7 +8,7 @@ Subject: [PATCH] add /etc/system-fips for dracut-fips subpackage 1 file changed, 5 insertions(+) diff --git a/dracut.spec b/dracut.spec -index 87340d7..b1cf9fe 100644 +index 87340d7a..b1cf9fef 100644 --- a/dracut.spec +++ b/dracut.spec @@ -271,6 +271,10 @@ echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-i diff --git a/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch b/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch index 622301a..f1890bb 100644 --- a/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch +++ b/SOURCES/0007-dracut-Generlize-microcode-early-cpio-usage.patch @@ -14,7 +14,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 177e66d..b3b8088 100755 +index 177e66d5..b3b80886 100755 --- a/dracut.sh +++ b/dracut.sh @@ -704,9 +704,9 @@ readonly initdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)" diff --git a/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch b/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch index 5033f73..b64c736 100644 --- a/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch +++ b/SOURCES/0008-dracut-Do-not-create-early_cpio-if-no-suitable-micro.patch @@ -22,7 +22,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index b3b8088..e43227e 100755 +index b3b80886..e43227e8 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1326,12 +1326,15 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch b/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch index 786df6d..c89141d 100644 --- a/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch +++ b/SOURCES/0009-dracut-Implement-ACPI-table-overriding.patch @@ -22,7 +22,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 11 insertions(+) diff --git a/dracut.sh b/dracut.sh -index e43227e..b4b3e13 100755 +index e43227e8..b4b3e13d 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1337,6 +1337,17 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch b/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch index 1020676..295ea5b 100644 --- a/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch +++ b/SOURCES/0010-dracut.conf.5.asc-Add-ACPI-table-override-and-uncomp.patch @@ -10,7 +10,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 15 insertions(+) diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index 63991d4..c9c854a 100644 +index 63991d4f..c9c854a9 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -125,6 +125,21 @@ If chrooted to another root other than the real root device, use --fstab and pro diff --git a/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch b/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch index 3cfa91f..8b4274d 100644 --- a/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch +++ b/SOURCES/0011-dracut-bash-completion.sh-add-prelink-noprelink.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-bash-completion.sh: add --prelink --noprelink 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh -index f822058..d796c35 100644 +index f822058d..d796c358 100644 --- a/dracut-bash-completion.sh +++ b/dracut-bash-completion.sh @@ -34,7 +34,7 @@ _dracut() { diff --git a/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch b/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch index 45e80ad..ad7ba64 100644 --- a/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch +++ b/SOURCES/0012-dracut.sh-bail-out-early-if-destination-dir-is-not-w.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.sh: bail out early, if destination dir is not 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dracut.sh b/dracut.sh -index b4b3e13..e135dfc 100755 +index b4b3e13d..e135dfc8 100755 --- a/dracut.sh +++ b/dracut.sh @@ -824,9 +824,25 @@ if [[ -d $srcmods ]]; then diff --git a/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch b/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch index 29d670c..5b96ef3 100644 --- a/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch +++ b/SOURCES/0013-dracut-logger.sh-do-not-log-to-syslog-kmsg-journal-f.patch @@ -12,7 +12,7 @@ Also check, if systemd-cat works, before using it. 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dracut-logger.sh b/dracut-logger.sh -index b052581..f679dc9 100755 +index b052581e..f679dc94 100755 --- a/dracut-logger.sh +++ b/dracut-logger.sh @@ -140,11 +140,16 @@ dlog_init() { diff --git a/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch b/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch index 06497b1..9060752 100644 --- a/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch +++ b/SOURCES/0014-lvm-mdraid-Fix-LVM-on-MD-activation.patch @@ -19,7 +19,7 @@ even for MD devices. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 2ef9a51..f98ffff 100755 +index 2ef9a514..f98ffffd 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -82,7 +82,7 @@ install() { @@ -32,7 +32,7 @@ index 2ef9a51..f98ffff 100755 # files, but provides the one below: inst_rules 64-device-mapper.rules diff --git a/modules.d/90mdraid/59-persistent-storage-md.rules b/modules.d/90mdraid/59-persistent-storage-md.rules -index bea9325..6ef858a 100644 +index bea93257..6ef858aa 100644 --- a/modules.d/90mdraid/59-persistent-storage-md.rules +++ b/modules.d/90mdraid/59-persistent-storage-md.rules @@ -20,4 +20,5 @@ IMPORT{program}="/sbin/mdadm --detail --export $tempnode" diff --git a/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch b/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch index 948bb0b..eb6793c 100644 --- a/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch +++ b/SOURCES/0015-bcache-optionally-install-the-tools-and-rules.patch @@ -8,7 +8,7 @@ Subject: [PATCH] bcache: optionally install the tools and rules 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/90bcache/module-setup.sh b/modules.d/90bcache/module-setup.sh -index b02b8b4..a5a57ed 100755 +index b02b8b4e..a5a57edb 100755 --- a/modules.d/90bcache/module-setup.sh +++ b/modules.d/90bcache/module-setup.sh @@ -27,7 +27,7 @@ installkernel() { diff --git a/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch b/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch index 813334c..de96cd1 100644 --- a/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch +++ b/SOURCES/0016-dracut-functions.sh-inst_rules-do-not-install-rules-.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-functions.sh:inst_rules() do not install rules in CWD 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index cf33af5..45e0911 100755 +index cf33af56..45e09118 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -882,7 +882,10 @@ inst_rules() { diff --git a/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch b/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch index f9ce093..3049402 100644 --- a/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch +++ b/SOURCES/0017-mdraid-module-setup.sh-install-configs-from-etc-mdad.patch @@ -10,7 +10,7 @@ Subject: [PATCH] mdraid/module-setup.sh: install configs from 1 file changed, 8 insertions(+) diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 5df2274..45767c6 100755 +index 5df2274b..45767c67 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -93,6 +93,14 @@ install() { diff --git a/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch b/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch index 160aae5..b738eaa 100644 --- a/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch +++ b/SOURCES/0018-mdraid-module-setup.sh-fixes-for-mdadm-3.2.6.patch @@ -16,7 +16,7 @@ the latter. 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 45767c6..34aae1e 100755 +index 45767c67..34aae1e3 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -59,6 +59,7 @@ cmdline() { diff --git a/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch b/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch index 9e5f118..3806fc9 100644 --- a/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch +++ b/SOURCES/0019-fcoe-add-FCoE-UEFI-boot-device-support.patch @@ -13,7 +13,7 @@ Subject: [PATCH] fcoe: add FCoE UEFI boot device support create mode 100755 modules.d/99base/uefi-lib.sh diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index d3c58cc..08ba4ea 100755 +index d3c58cc6..08ba4eac 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -32,6 +32,7 @@ install() { @@ -26,7 +26,7 @@ index d3c58cc..08ba4ea 100755 } diff --git a/modules.d/95fcoe/parse-uefifcoe.sh b/modules.d/95fcoe/parse-uefifcoe.sh new file mode 100755 -index 0000000..e03bcb3 +index 00000000..e03bcb39 --- /dev/null +++ b/modules.d/95fcoe/parse-uefifcoe.sh @@ -0,0 +1,35 @@ @@ -66,7 +66,7 @@ index 0000000..e03bcb3 + print_fcoe_uefi_conf > /etc/cmdline.d/40-fcoe-uefi.conf +fi diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index 52ce400..d33a0fb 100755 +index 52ce4004..d33a0fb4 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -42,6 +42,7 @@ install() { @@ -79,7 +79,7 @@ index 52ce400..d33a0fb 100755 inst_multiple switch_root || dfatal "Failed to install switch_root" diff --git a/modules.d/99base/uefi-lib.sh b/modules.d/99base/uefi-lib.sh new file mode 100755 -index 0000000..faedbac +index 00000000..faedbac5 --- /dev/null +++ b/modules.d/99base/uefi-lib.sh @@ -0,0 +1,155 @@ diff --git a/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch b/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch index 9cb2a9c..d1b32de 100644 --- a/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch +++ b/SOURCES/0020-rootfs-block-add-support-for-the-rootfallback-kernel.patch @@ -12,7 +12,7 @@ Subject: [PATCH] rootfs-block: add support for the rootfallback= kernel create mode 100755 modules.d/95rootfs-block/rootfallback.sh diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 09c47e8..4b2ab03 100644 +index 09c47e85..4b2ab035 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -69,6 +69,12 @@ rootfstype=ext3 @@ -29,7 +29,7 @@ index 09c47e8..4b2ab03 100644 enable autoassembly of special devices like cryptoLUKS, dmraid, mdraid or lvm. Default is off as of dracut version >= 024. diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh -index f066a79..7e714eb 100755 +index f066a79c..7e714eb0 100755 --- a/modules.d/95rootfs-block/module-setup.sh +++ b/modules.d/95rootfs-block/module-setup.sh @@ -44,5 +44,6 @@ install() { @@ -42,7 +42,7 @@ index f066a79..7e714eb 100755 +} diff --git a/modules.d/95rootfs-block/rootfallback.sh b/modules.d/95rootfs-block/rootfallback.sh new file mode 100755 -index 0000000..246ce9a +index 00000000..246ce9a4 --- /dev/null +++ b/modules.d/95rootfs-block/rootfallback.sh @@ -0,0 +1,46 @@ diff --git a/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch b/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch index 62473d8..328413d 100644 --- a/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch +++ b/SOURCES/0021-btrfs-use-inst_hook-to-install-the-timeout-hook.patch @@ -8,7 +8,7 @@ Subject: [PATCH] btrfs: use inst_hook to install the timeout hook 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh -index 638a050..a280594 100755 +index 638a0505..a2805946 100755 --- a/modules.d/90btrfs/module-setup.sh +++ b/modules.d/90btrfs/module-setup.sh @@ -39,8 +39,7 @@ install() { diff --git a/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch b/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch index df0f97d..3ff05e2 100644 --- a/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch +++ b/SOURCES/0022-lvm-install-thin-utils-for-non-hostonly.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lvm: install thin utils for non-hostonly 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index f98ffff..514addc 100755 +index f98ffffd..514addc1 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -52,13 +52,17 @@ install() { diff --git a/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch b/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch index d1baa17..0f4b236 100644 --- a/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch +++ b/SOURCES/0023-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch @@ -9,7 +9,7 @@ and only print a warning message 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dracut.sh b/dracut.sh -index e135dfc..d9533dd 100755 +index e135dfc8..d9533dd0 100755 --- a/dracut.sh +++ b/dracut.sh @@ -496,17 +496,18 @@ if [[ $regenerate_all == "yes" ]]; then diff --git a/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch b/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch index 5a21944..2216c06 100644 --- a/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch +++ b/SOURCES/0024-dmsquash-live-add-dev-mapper-live-base.patch @@ -22,7 +22,7 @@ use whether or not there is an osmin present. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 8951f80..5705e8d 100755 +index 8951f80c..5705e8df 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -144,6 +144,9 @@ do_live_overlay() { diff --git a/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch b/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch index c627001..ad003f6 100644 --- a/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch +++ b/SOURCES/0025-Doc-cleanup-extend-and-split-and-reuse.patch @@ -17,7 +17,7 @@ Subject: [PATCH] Doc: cleanup, extend and split and reuse create mode 100644 dracut.usage.asc diff --git a/Makefile b/Makefile -index 124a41b..e7da948 100644 +index 124a41b1..e7da9484 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ man1pages = lsinitrd.1 @@ -50,7 +50,7 @@ index 124a41b..e7da948 100644 xsltproc -o dracut.html --xinclude -nonet \ --stringparam custom.css.source dracut.css \ diff --git a/dracut.8.asc b/dracut.8.asc -index 76fc75c..584514c 100644 +index 76fc75c4..584514c0 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -10,7 +10,7 @@ dracut - low-level tool for generating an initramfs image @@ -163,7 +163,7 @@ index 76fc75c..584514c 100644 AVAILABILITY diff --git a/dracut.asc b/dracut.asc -index c011658..031b201 100644 +index c0116581..031b2014 100644 --- a/dracut.asc +++ b/dracut.asc @@ -1,7 +1,7 @@ @@ -1079,7 +1079,7 @@ index c011658..031b201 100644 [appendix] License diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 4b2ab03..19bfb93 100644 +index 4b2ab035..19bfb939 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -31,16 +31,16 @@ line is the value, which is honored. @@ -1859,7 +1859,7 @@ index 4b2ab03..19bfb93 100644 Deprecated, renamed Options ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/dracut.css b/dracut.css -index e419a06..357ede1 100644 +index e419a067..357ede1b 100644 --- a/dracut.css +++ b/dracut.css @@ -14,45 +14,6 @@ body { @@ -2369,7 +2369,7 @@ index e419a06..357ede1 100644 } diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc new file mode 100644 -index 0000000..4cb2aa1 +index 00000000..4cb2aa15 --- /dev/null +++ b/dracut.modules.7.asc @@ -0,0 +1,293 @@ @@ -2667,7 +2667,7 @@ index 0000000..4cb2aa1 +-------- +*dracut*(8) diff --git a/dracut.spec b/dracut.spec -index b1cf9fe..8dfc753 100644 +index b1cf9fef..8dfc7535 100644 --- a/dracut.spec +++ b/dracut.spec @@ -316,6 +316,7 @@ rm -rf -- $RPM_BUILD_ROOT @@ -2680,7 +2680,7 @@ index b1cf9fe..8dfc753 100644 %if %{defined _unitdir} diff --git a/dracut.usage.asc b/dracut.usage.asc new file mode 100644 -index 0000000..6d37920 +index 00000000..6d37920f --- /dev/null +++ b/dracut.usage.asc @@ -0,0 +1,526 @@ diff --git a/SOURCES/0026-lvm-fix-thin-recognition.patch b/SOURCES/0026-lvm-fix-thin-recognition.patch index a94c3ed..05324f3 100644 --- a/SOURCES/0026-lvm-fix-thin-recognition.patch +++ b/SOURCES/0026-lvm-fix-thin-recognition.patch @@ -16,7 +16,7 @@ where /dev/fd does not point to /proc/self/fd, but bash wants 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 514addc..50d9b98 100755 +index 514addc1..50d9b98e 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -53,12 +53,13 @@ install() { diff --git a/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch b/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch index 4e20fcb..e5f2b4c 100644 --- a/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch +++ b/SOURCES/0027-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch @@ -11,7 +11,7 @@ If it is an LVM device, touch only devices which have /dev/VG/LV symlink. 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 45e0911..2e6e845 100755 +index 45e09118..2e6e8456 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -579,7 +579,7 @@ host_fs_all() diff --git a/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch b/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch index 2d321c0..abca0f6 100644 --- a/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch +++ b/SOURCES/0028-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch @@ -25,7 +25,7 @@ Signed-off-by: P J P 2 files changed, 29 insertions(+) diff --git a/dracut.8.asc b/dracut.8.asc -index 584514c..2ea6744 100644 +index 584514c0..2ea67447 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -365,6 +365,22 @@ Make sure your kernel has xz decompression support compiled in, otherwise you @@ -52,7 +52,7 @@ index 584514c..2ea6744 100644 Compress the generated initramfs using the passed compression program. If you pass it just the name of a compression program, it will call that diff --git a/dracut.sh b/dracut.sh -index d9533dd..173a259 100755 +index d9533dd0..173a259a 100755 --- a/dracut.sh +++ b/dracut.sh @@ -165,6 +165,12 @@ Creates initial ramdisk images for preloading modules diff --git a/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch b/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch index d15b018..8537e95 100644 --- a/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch +++ b/SOURCES/0029-git2spec.pl-remove-.git-date-from-release-string.patch @@ -8,7 +8,7 @@ Subject: [PATCH] git2spec.pl: remove ".git$(date)" from release string 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git2spec.pl b/git2spec.pl -index 0d8adb4..b844295 100755 +index 0d8adb4a..b8442951 100755 --- a/git2spec.pl +++ b/git2spec.pl @@ -20,8 +20,7 @@ chomp($tag); diff --git a/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch b/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch index ccf5fdb..e90bd26 100644 --- a/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch +++ b/SOURCES/0030-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kernel-modules(ARM): add mmc_block usb_storage to statis list 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index e7e2ca0..366235c 100755 +index e7e2ca07..366235ca 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -48,7 +48,7 @@ installkernel() { diff --git a/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch b/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch index 6c5d77b..1cb3aef 100644 --- a/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch +++ b/SOURCES/0031-lvm-always-install-thin-utils-for-lvm.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lvm: always install thin utils for lvm 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 50d9b98..f1c19a2 100755 +index 50d9b98e..f1c19a22 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -22,7 +22,8 @@ depends() { diff --git a/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch b/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch index 9e549cb..8710a3b 100644 --- a/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch +++ b/SOURCES/0032-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.spec: move /sbin/dracut to /usr/sbin/dracut 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dracut.spec b/dracut.spec -index 8dfc753..596d728 100644 +index 8dfc7535..596d7283 100644 --- a/dracut.spec +++ b/dracut.spec @@ -276,8 +276,8 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ diff --git a/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch b/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch index e5d4917..5a71168 100644 --- a/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch +++ b/SOURCES/0033-usrmount-module-setup.sh-fixed-typo.patch @@ -8,7 +8,7 @@ Subject: [PATCH] usrmount/module-setup.sh: fixed typo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98usrmount/module-setup.sh b/modules.d/98usrmount/module-setup.sh -index a668069..1dde937 100755 +index a6680693..1dde9376 100755 --- a/modules.d/98usrmount/module-setup.sh +++ b/modules.d/98usrmount/module-setup.sh @@ -6,7 +6,7 @@ check() { diff --git a/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch b/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch index ca2de67..1a5ee5c 100644 --- a/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch +++ b/SOURCES/0034-Handle-crypto-modules-with-and-without-modaliases.patch @@ -14,7 +14,7 @@ Also add the crypto drivers and names to host_modalias. 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 2e6e845..38095ba 100755 +index 2e6e8456..38095ba4 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1480,7 +1480,7 @@ dracut_kernel_post() { @@ -56,7 +56,7 @@ index 2e6e845..38095ba 100755 return 1 diff --git a/dracut.sh b/dracut.sh -index 173a259..c6a388a 100755 +index 173a259a..c6a388ab 100755 --- a/dracut.sh +++ b/dracut.sh @@ -968,6 +968,11 @@ if [[ $hostonly ]]; then @@ -72,7 +72,7 @@ index 173a259..c6a388a 100755 declare -A host_modules while read m rest; do diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index f0a4c5c..98dd1c2 100755 +index f0a4c5c2..98dd1c2f 100755 --- a/modules.d/01fips/fips.sh +++ b/modules.d/01fips/fips.sh @@ -96,7 +96,6 @@ do_fips() diff --git a/SOURCES/0035-fips-include-crct10dif_generic.patch b/SOURCES/0035-fips-include-crct10dif_generic.patch index da4c535..1bc6a25 100644 --- a/SOURCES/0035-fips-include-crct10dif_generic.patch +++ b/SOURCES/0035-fips-include-crct10dif_generic.patch @@ -9,7 +9,7 @@ Resolves: rhbz#1024455 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index d08e3f7..1ab4999 100755 +index d08e3f74..1ab4999a 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -13,7 +13,7 @@ depends() { diff --git a/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch b/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch index 75bcfdd..efc3e2f 100644 --- a/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch +++ b/SOURCES/0036-resume-fix-swap-detection-in-hostonly.patch @@ -14,7 +14,7 @@ libvolume_id thing and host_fs_types is populated using blkid. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index 518ebf0..a1ddb46 100755 +index 518ebf06..a1ddb460 100755 --- a/modules.d/95resume/module-setup.sh +++ b/modules.d/95resume/module-setup.sh @@ -6,7 +6,7 @@ check() { diff --git a/SOURCES/0037-resume-remove-resume-genrules.sh.patch b/SOURCES/0037-resume-remove-resume-genrules.sh.patch index eac9fe3..5973deb 100644 --- a/SOURCES/0037-resume-remove-resume-genrules.sh.patch +++ b/SOURCES/0037-resume-remove-resume-genrules.sh.patch @@ -18,7 +18,7 @@ dracut-initqueue: rm: cannot remove '/lib/dracut/hooks/initqueue/timeout/resume. delete mode 100755 modules.d/95resume/resume-genrules.sh diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh -index a1ddb46..c4e9363 100755 +index a1ddb460..c4e93636 100755 --- a/modules.d/95resume/module-setup.sh +++ b/modules.d/95resume/module-setup.sh @@ -30,7 +30,6 @@ install() { @@ -31,7 +31,7 @@ index a1ddb46..c4e9363 100755 inst_script "$moddir/resume.sh" /lib/dracut/resume.sh diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh deleted file mode 100755 -index c542c71..0000000 +index c542c715..00000000 --- a/modules.d/95resume/resume-genrules.sh +++ /dev/null @@ -1,51 +0,0 @@ diff --git a/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch b/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch index 7513a16..7ff37a2 100644 --- a/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch +++ b/SOURCES/0038-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch @@ -11,7 +11,7 @@ only mount the whole disk for root=dhcp 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 5181f52..738fff4 100755 +index 5181f523..738fff44 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -40,14 +40,6 @@ modprobe crc32c 2>/dev/null @@ -47,7 +47,7 @@ index 5181f52..738fff4 100755 printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules udevadm control --reload diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh -index 823da0e..2e9d917 100755 +index 823da0ea..2e9d9174 100755 --- a/modules.d/95nbd/nbdroot.sh +++ b/modules.d/95nbd/nbdroot.sh @@ -97,7 +97,7 @@ done diff --git a/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch b/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch index 1a0891f..d4b5fd1 100644 --- a/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch +++ b/SOURCES/0039-fips-also-install-etc-system-fips-in-the-initramfs.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fips: also install /etc/system-fips in the initramfs 1 file changed, 1 insertion(+) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 1ab4999..35cfdc5 100755 +index 1ab4999a..35cfdc5a 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -41,5 +41,6 @@ install() { diff --git a/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch b/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch index f0dc5dc..d8e9977 100644 --- a/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch +++ b/SOURCES/0040-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch @@ -21,7 +21,7 @@ were unusable. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 38095ba..2872516 100755 +index 38095ba4..2872516a 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -65,6 +65,7 @@ ldconfig_paths() diff --git a/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch b/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch index 3e4d763..336875c 100644 --- a/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch +++ b/SOURCES/0041-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch @@ -11,7 +11,7 @@ asked 1 file changed, 4 insertions(+) diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index d7ebf2b..64e8154 100755 +index d7ebf2b2..64e81541 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -52,6 +52,10 @@ while :; do diff --git a/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch b/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch index f6df29f..e9e15fa 100644 --- a/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch +++ b/SOURCES/0042-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kernel-modules: add ohci-pci to the list of forced module 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 366235c..510b43e 100755 +index 366235ca..510b43e1 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -35,9 +35,12 @@ installkernel() { diff --git a/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch b/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch index a18e8ac..c6bf25a 100644 --- a/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch +++ b/SOURCES/0043-lvm-do-not-run-pvscan-for-lvmetad-update.patch @@ -14,7 +14,7 @@ instantiated service which is run only once! 1 file changed, 10 insertions(+) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index f1c19a2..7e3d44f 100755 +index f1c19a22..7e3d44fa 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -74,6 +74,16 @@ install() { diff --git a/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch b/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch index a0b2da5..323a773 100644 --- a/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch +++ b/SOURCES/0044-fips-fix-RHEV-vmlinuz-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fips: fix RHEV vmlinuz check 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index 98dd1c2..7fa48f1 100755 +index 98dd1c2f..7fa48f13 100755 --- a/modules.d/01fips/fips.sh +++ b/modules.d/01fips/fips.sh @@ -60,8 +60,8 @@ do_rhevh_check() diff --git a/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch b/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch index 5cd1cde..9fc3864 100644 --- a/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch +++ b/SOURCES/0045-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.cmdline.7.asc: document "server-ip" of "ip=" parameter 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 19bfb93..6a5fc8f 100644 +index 19bfb939..6a5fc8f6 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -444,10 +444,12 @@ cannot be used in conjunction with the **ifname** argument for the diff --git a/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch b/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch index e1fce81..70b469d 100644 --- a/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch +++ b/SOURCES/0046-dracut.sh-_get_fs_type-if-block-device-exists-return.patch @@ -9,7 +9,7 @@ even, if no ID_FS_TYPE was found, return if the block device exists 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh -index c6a388a..5f14d50 100755 +index c6a388ab..5f14d503 100755 --- a/dracut.sh +++ b/dracut.sh @@ -985,12 +985,12 @@ unset rest diff --git a/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch b/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch index 7397240..4682451 100644 --- a/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch +++ b/SOURCES/0047-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch @@ -9,7 +9,7 @@ really wait for "state UP", otherwise it returns earlier than we want 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 88e72ec..0aa312a 100644 +index 88e72ece..0aa312a0 100644 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -443,7 +443,7 @@ wait_for_if_up() { diff --git a/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch b/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch index 6e87422..77dfc54 100644 --- a/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch +++ b/SOURCES/0048-network-net-lib.sh-iface_has_link-fixup.patch @@ -10,7 +10,7 @@ carrier state immediately. So wait for it to really show up. 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 0aa312a..7544401 100644 +index 0aa312a0..7544401f 100644 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -28,30 +28,6 @@ iface_for_mac() { diff --git a/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch b/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch index deb455b..b581d9b 100644 --- a/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch +++ b/SOURCES/0049-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/ifup.sh: before doing dhcp, check, if the link has a 1 file changed, 4 insertions(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 9f6f449..2edcfe6 100755 +index 9f6f4494..2edcfe69 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -87,6 +87,10 @@ do_dhcp() { diff --git a/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch b/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch index b7791d8..2dfcbda 100644 --- a/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch +++ b/SOURCES/0050-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch @@ -12,7 +12,7 @@ systems, where: 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 74d7d35..7249c58 100755 +index 74d7d352..7249c589 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -856,9 +856,9 @@ wait_for_dev() diff --git a/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch b/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch index 27273c3..543ed1b 100644 --- a/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch +++ b/SOURCES/0051-dracut.sh-skip-crypt-swaps-with-password-files.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: skip crypt swaps with password files 1 file changed, 2 insertions(+) diff --git a/dracut.sh b/dracut.sh -index 5f14d50..b03522b 100755 +index 5f14d503..b03522bf 100755 --- a/dracut.sh +++ b/dracut.sh @@ -945,6 +945,8 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch b/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch index 6f8b14c..384dfe1 100644 --- a/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch +++ b/SOURCES/0053-Remove-shebang-from-shell-completion-files.patch @@ -13,7 +13,7 @@ Signed-off-by: Hannes Reinecke 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh -index d796c35..9f359c6 100644 +index d796c358..9f359c6e 100644 --- a/dracut-bash-completion.sh +++ b/dracut-bash-completion.sh @@ -1,4 +1,4 @@ @@ -23,7 +23,7 @@ index d796c35..9f359c6 100644 # ex: ts=8 sw=4 sts=4 et filetype=sh # diff --git a/lsinitrd-bash-completion.sh b/lsinitrd-bash-completion.sh -index 78ab165..3df2965 100644 +index 78ab1654..3df2965f 100644 --- a/lsinitrd-bash-completion.sh +++ b/lsinitrd-bash-completion.sh @@ -1,4 +1,4 @@ diff --git a/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch b/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch index cac4bc7..515454f 100644 --- a/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch +++ b/SOURCES/0054-i18n-introduce-i18n_install_all-to-install-everythin.patch @@ -15,7 +15,7 @@ the initramfs. 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index c9c854a..30b7e03 100644 +index c9c854a9..30b7e030 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -122,10 +122,10 @@ If chrooted to another root other than the real root device, use --fstab and pro @@ -49,7 +49,7 @@ index c9c854a..30b7e03 100644 ----- _/etc/dracut.conf_:: diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example -index 1a56a86..495e8fb 100644 +index 1a56a864..495e8fb3 100644 --- a/dracut.conf.d/fedora.conf.example +++ b/dracut.conf.d/fedora.conf.example @@ -3,6 +3,7 @@ @@ -61,7 +61,7 @@ index 1a56a86..495e8fb 100644 sysloglvl=5 install_items+=" vi /etc/virc ps grep cat rm " diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 2a83728..413ee12 100755 +index 2a837280..413ee123 100755 --- a/modules.d/10i18n/module-setup.sh +++ b/modules.d/10i18n/module-setup.sh @@ -18,15 +18,11 @@ depends() { diff --git a/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch b/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch index 165862d..aedc08c 100644 --- a/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch +++ b/SOURCES/0055-Run-xz-and-lzma-with-multiple-threads.patch @@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1029786 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index b03522b..59d3e4b 100755 +index b03522bf..59d3e4b2 100755 --- a/dracut.sh +++ b/dracut.sh @@ -693,12 +693,14 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) diff --git a/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch b/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch index 6dea759..5596c1c 100644 --- a/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch +++ b/SOURCES/0056-iscsi-nbd-do-not-fail-in-hostonly-mode.patch @@ -9,7 +9,7 @@ Subject: [PATCH] iscsi,nbd: do not fail in hostonly mode 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 502e834..c6901c0 100755 +index 502e8345..c6901c08 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -23,7 +23,7 @@ check() { @@ -22,7 +22,7 @@ index 502e834..c6901c0 100755 } return 0 diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh -index 7b78180..3ac00f6 100755 +index 7b781803..3ac00f60 100755 --- a/modules.d/95nbd/module-setup.sh +++ b/modules.d/95nbd/module-setup.sh @@ -14,7 +14,7 @@ check() { diff --git a/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch b/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch index 97b45ac..ef88f53 100644 --- a/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch +++ b/SOURCES/0057-dracut.sh-fixed-PATH-shortener.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: fixed PATH shortener 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 59d3e4b..bb7e91e 100755 +index 59d3e4b2..bb7e91e6 100755 --- a/dracut.sh +++ b/dracut.sh @@ -533,7 +533,7 @@ for i in /usr/sbin /sbin /usr/bin /bin; do diff --git a/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch b/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch index f1ea255..fb628c7 100644 --- a/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch +++ b/SOURCES/0058-dracut.modules.7.asc-removed-empty-section.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.modules.7.asc: removed empty section 1 file changed, 1 deletion(-) diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc -index 4cb2aa1..17acdb4 100644 +index 4cb2aa15..17acdb4d 100644 --- a/dracut.modules.7.asc +++ b/dracut.modules.7.asc @@ -10,7 +10,6 @@ dracut.modules - dracut modules diff --git a/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch b/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch index 791974f..5db0966 100644 --- a/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch +++ b/SOURCES/0059-lvm-install-thin-tools-only-when-needed-in-hostonly.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lvm: install thin tools, only when needed in hostonly 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 7e3d44f..877631b 100755 +index 7e3d44fa..877631bb 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -95,5 +95,11 @@ install() { diff --git a/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch b/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch index 6d6a599..739cac4 100644 --- a/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch +++ b/SOURCES/0060-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch @@ -11,7 +11,7 @@ currently asked 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 64e8154..1e05dcd 100755 +index 64e81541..1e05dcd0 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -53,7 +53,7 @@ while :; do diff --git a/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch b/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch index 73683f7..ac40102 100644 --- a/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch +++ b/SOURCES/0061-base-rdsosreport.sh-add-ip-a-output.patch @@ -8,7 +8,7 @@ Subject: [PATCH] base/rdsosreport.sh: add "ip a" output 1 file changed, 2 insertions(+) diff --git a/modules.d/99base/rdsosreport.sh b/modules.d/99base/rdsosreport.sh -index bfa55bb..5e11166 100755 +index bfa55bbb..5e11166e 100755 --- a/modules.d/99base/rdsosreport.sh +++ b/modules.d/99base/rdsosreport.sh @@ -42,6 +42,8 @@ command -v dmsetup >/dev/null 2>/dev/null && dmsetup ls --tree diff --git a/SOURCES/0062-lvm-fixed-lvm-thin-check.patch b/SOURCES/0062-lvm-fixed-lvm-thin-check.patch index 6fbb31b..84691f1 100644 --- a/SOURCES/0062-lvm-fixed-lvm-thin-check.patch +++ b/SOURCES/0062-lvm-fixed-lvm-thin-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lvm: fixed lvm thin check 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 877631b..f0c9b96 100755 +index 877631bb..f0c9b964 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -97,9 +97,16 @@ install() { diff --git 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 index 4763ced..1ccef0e 100644 --- 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 @@ -24,14 +24,14 @@ Subject: [PATCH] test/TEST-17-LVM-THIN: add test case for lvm thin pools diff --git a/test/TEST-17-LVM-THIN/.testdir b/test/TEST-17-LVM-THIN/.testdir new file mode 100644 -index 0000000..9af2638 +index 00000000..9af2638c --- /dev/null +++ b/test/TEST-17-LVM-THIN/.testdir @@ -0,0 +1 @@ +TESTDIR="/var/tmp/dracut-test.uElZSK" diff --git a/test/TEST-17-LVM-THIN/99-idesymlinks.rules b/test/TEST-17-LVM-THIN/99-idesymlinks.rules new file mode 100644 -index 0000000..d557790 +index 00000000..d557790a --- /dev/null +++ b/test/TEST-17-LVM-THIN/99-idesymlinks.rules @@ -0,0 +1,8 @@ @@ -45,7 +45,7 @@ index 0000000..d557790 +ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdd*", SYMLINK+="sdd$env{MINOR}" diff --git a/test/TEST-17-LVM-THIN/Makefile b/test/TEST-17-LVM-THIN/Makefile new file mode 100644 -index 0000000..aad2705 +index 00000000..aad27059 --- /dev/null +++ b/test/TEST-17-LVM-THIN/Makefile @@ -0,0 +1,10 @@ @@ -61,7 +61,7 @@ index 0000000..aad2705 + @basedir=../.. testdir=../ ./test.sh --run diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh new file mode 100755 -index 0000000..740704f +index 00000000..740704f6 --- /dev/null +++ b/test/TEST-17-LVM-THIN/create-root.sh @@ -0,0 +1,31 @@ @@ -98,7 +98,7 @@ index 0000000..740704f +poweroff -f diff --git a/test/TEST-17-LVM-THIN/finished-false.sh b/test/TEST-17-LVM-THIN/finished-false.sh new file mode 100755 -index 0000000..ecdbef9 +index 00000000..ecdbef95 --- /dev/null +++ b/test/TEST-17-LVM-THIN/finished-false.sh @@ -0,0 +1,2 @@ @@ -106,7 +106,7 @@ index 0000000..ecdbef9 +exit 1 diff --git a/test/TEST-17-LVM-THIN/hard-off.sh b/test/TEST-17-LVM-THIN/hard-off.sh new file mode 100755 -index 0000000..12c3d5a +index 00000000..12c3d5ac --- /dev/null +++ b/test/TEST-17-LVM-THIN/hard-off.sh @@ -0,0 +1,3 @@ @@ -115,7 +115,7 @@ index 0000000..12c3d5a +getarg failme && poweroff -f diff --git a/test/TEST-17-LVM-THIN/test-init.sh b/test/TEST-17-LVM-THIN/test-init.sh new file mode 100755 -index 0000000..fd03aa5 +index 00000000..fd03aa5c --- /dev/null +++ b/test/TEST-17-LVM-THIN/test-init.sh @@ -0,0 +1,17 @@ @@ -138,7 +138,7 @@ index 0000000..fd03aa5 +poweroff -f diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh new file mode 100755 -index 0000000..0cfce19 +index 00000000..0cfce199 --- /dev/null +++ b/test/TEST-17-LVM-THIN/test.sh @@ -0,0 +1,88 @@ diff --git a/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch b/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch index 3cf9809..86d8ee0 100644 --- a/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch +++ b/SOURCES/0064-test-TEST-17-LVM-THIN-remove-.testdir.patch @@ -10,7 +10,7 @@ Subject: [PATCH] test/TEST-17-LVM-THIN: remove .testdir diff --git a/test/TEST-17-LVM-THIN/.testdir b/test/TEST-17-LVM-THIN/.testdir deleted file mode 100644 -index 9af2638..0000000 +index 9af2638c..00000000 --- a/test/TEST-17-LVM-THIN/.testdir +++ /dev/null @@ -1 +0,0 @@ diff --git a/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch b/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch index 29f8289..d21c508 100644 --- a/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch +++ b/SOURCES/0065-iscsi-do-iscsi_firmware-regardless-of-network.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1031160 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 738fff4..ef090f7 100755 +index 738fff44..ef090f7f 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -44,13 +44,15 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then @@ -39,7 +39,7 @@ index 738fff4..ef090f7 100755 { local iscsi_initiator iscsi_target_name iscsi_target_ip iscsi_target_port diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 0c8b524..77bd991 100755 +index 0c8b524b..77bd9913 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -64,7 +64,7 @@ if [ -n "$iscsi_firmware" ] ; then @@ -52,7 +52,7 @@ index 0c8b524..77bd991 100755 # If it's not iscsi we don't continue diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index 4c29956..f597783 100755 +index 4c299564..f5977839 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -69,7 +69,7 @@ do_test_run() { diff --git 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 index b789cde..39e5180 100644 --- 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 @@ -13,7 +13,7 @@ prevent a systemd daemon-reload, if it is not necessary to do. create mode 100755 modules.d/98systemd/rootfs-generator.sh diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index 50b8d6c..36406d9 100755 +index 50b8d6c9..36406d9d 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -66,8 +66,6 @@ case "$root" in @@ -26,7 +26,7 @@ index 50b8d6c..36406d9 100755 [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'" diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index a5ac2a5..7b3dfa4 100755 +index a5ac2a53..7b3dfa40 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -178,6 +178,8 @@ install() { @@ -40,7 +40,7 @@ index a5ac2a5..7b3dfa4 100755 for i in \ diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh new file mode 100755 -index 0000000..3770c6b +index 00000000..3770c6b1 --- /dev/null +++ b/modules.d/98systemd/rootfs-generator.sh @@ -0,0 +1,30 @@ @@ -75,7 +75,7 @@ index 0000000..3770c6b + +[ "${root%%:*}" = "block" ] && wait_for_dev -n "${root#block:}" diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 7249c58..a3476ab 100755 +index 7249c589..a3476ab3 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -846,7 +846,18 @@ dev_unit_name() diff --git a/SOURCES/0067-kernel-modules-add-more-block-driver.patch b/SOURCES/0067-kernel-modules-add-more-block-driver.patch index 3c5a1de..ee9110f 100644 --- a/SOURCES/0067-kernel-modules-add-more-block-driver.patch +++ b/SOURCES/0067-kernel-modules-add-more-block-driver.patch @@ -9,7 +9,7 @@ e.g. nvme 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 510b43e..f4db6aa 100755 +index 510b43e1..f4db6aa8 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -5,7 +5,7 @@ diff --git a/SOURCES/0068-network-include-usbnet-drivers.patch b/SOURCES/0068-network-include-usbnet-drivers.patch index 673c899..8975b15 100644 --- a/SOURCES/0068-network-include-usbnet-drivers.patch +++ b/SOURCES/0068-network-include-usbnet-drivers.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network: include usbnet drivers 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index d2833d0..508dbab 100755 +index d2833d0f..508dbab1 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -23,7 +23,7 @@ installkernel() { diff --git a/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch b/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch index e9755d1..ce7145b 100644 --- a/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch +++ b/SOURCES/0069-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/dracut-initqueue.sh: fstab is not a directory 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 1e05dcd..37bc18f 100755 +index 1e05dcd0..37bc18f1 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -67,7 +67,7 @@ while :; do diff --git a/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch b/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch index a8e64f5..86a5d20 100644 --- a/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch +++ b/SOURCES/0070-iscsi-iscsiroot.sh-do-not-trust-iscsistart-return-va.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/iscsiroot.sh: do not trust iscsistart return value 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index ef090f7..abdea5c 100755 +index ef090f7f..abdea5cf 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -44,7 +44,8 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then diff --git a/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch b/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch index 9138e75..7b8dee4 100644 --- a/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch +++ b/SOURCES/0071-dracut.sh-add-missing-piece-for-option-add-device.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: add missing piece for option --add-device 1 file changed, 1 insertion(+) diff --git a/dracut.sh b/dracut.sh -index bb7e91e..9a6521e 100755 +index bb7e91e6..9a6521ec 100755 --- a/dracut.sh +++ b/dracut.sh @@ -307,6 +307,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ diff --git a/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch b/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch index e99d621..6e45edf 100644 --- a/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch +++ b/SOURCES/0072-dracut.sh-add-boot-efi-to-device-paths.patch @@ -10,7 +10,7 @@ and it can be repaired in the initramfs. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 9a6521e..cf027e7 100755 +index 9a6521ec..cf027e7d 100755 --- a/dracut.sh +++ b/dracut.sh @@ -917,7 +917,9 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0073-documentation-line-wrap.patch b/SOURCES/0073-documentation-line-wrap.patch index 3e5b268..9a1e150 100644 --- a/SOURCES/0073-documentation-line-wrap.patch +++ b/SOURCES/0073-documentation-line-wrap.patch @@ -15,7 +15,7 @@ Subject: [PATCH] documentation: line wrap 8 files changed, 165 insertions(+), 103 deletions(-) diff --git a/dracut.8.asc b/dracut.8.asc -index 2ea6744..b294675 100644 +index 2ea67447..b2946753 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -33,9 +33,9 @@ For a complete list of kernel command line options see *dracut.cmdline*(7). @@ -63,7 +63,7 @@ index 2ea6744..b294675 100644 _/etc/cmdline.d/*.conf_:: Can contain additional command line options. diff --git a/dracut.asc b/dracut.asc -index 031b201..b047a33 100644 +index 031b2014..b047a337 100644 --- a/dracut.asc +++ b/dracut.asc @@ -125,12 +125,14 @@ started looks like <>. @@ -97,7 +97,7 @@ index 031b201..b047a33 100644 This ensures, that all devices are disassembled and unmounted cleanly. diff --git a/dracut.bootup.7.asc b/dracut.bootup.7.asc -index c35af19..d7edc1e 100644 +index c35af195..d7edc1e7 100644 --- a/dracut.bootup.7.asc +++ b/dracut.bootup.7.asc @@ -11,7 +11,8 @@ dracut.bootup - boot ordering in the initramfs @@ -111,7 +111,7 @@ index c35af19..d7edc1e 100644 systemd-journal.socket diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 6a5fc8f..8ac5341 100644 +index 6a5fc8f6..8ac53414 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -72,14 +72,14 @@ rootfstype=ext3 @@ -386,7 +386,7 @@ index 6a5fc8f..8ac5341 100644 _/etc/cmdline.d/*.conf_:: Can contain additional command line options. diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index 30b7e03..5c94118 100644 +index 30b7e030..5c941188 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -10,17 +10,19 @@ dracut.conf - configuration file(s) for dracut @@ -435,7 +435,7 @@ index 30b7e03..5c94118 100644 *i18n_install_all=*"__{yes|no}__":: Install everything regardless of generic or hostonly mode. diff --git a/dracut.modules.7.asc b/dracut.modules.7.asc -index 17acdb4..e94670f 100644 +index 17acdb4d..e94670f3 100644 --- a/dracut.modules.7.asc +++ b/dracut.modules.7.asc @@ -96,8 +96,8 @@ This hooks (initqueue/settled) gets executed every time udev has settled. @@ -533,7 +533,7 @@ index 17acdb4..e94670f 100644 ---- hostonly='' instmods diff --git a/dracut.usage.asc b/dracut.usage.asc -index 6d37920..0b874e6 100644 +index 6d37920f..0b874e60 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -43,7 +43,8 @@ pieces. At least keep a copy of a general purpose image (and corresponding @@ -656,7 +656,7 @@ index 6d37920..0b874e6 100644 +initramfs. diff --git a/mkinitrd.8.asc b/mkinitrd.8.asc -index 25661c8..146a6d0 100644 +index 25661c8d..146a6d0f 100644 --- a/mkinitrd.8.asc +++ b/mkinitrd.8.asc @@ -41,8 +41,8 @@ OPTIONS diff --git a/SOURCES/0074-network-include-all-ethernet-drivers.patch b/SOURCES/0074-network-include-all-ethernet-drivers.patch index be36d1e..f687fa5 100644 --- a/SOURCES/0074-network-include-all-ethernet-drivers.patch +++ b/SOURCES/0074-network-include-all-ethernet-drivers.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network: include all ethernet drivers 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 508dbab..a5e796f 100755 +index 508dbab1..a5e796f4 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -24,7 +24,7 @@ installkernel() { diff --git a/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch b/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch index 7ba2550..d5b8774 100644 --- a/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch +++ b/SOURCES/0075-dracut-install-dracut-fix-ldd-output-parsing.patch @@ -13,7 +13,7 @@ also unset LD_PRELOAD, so we get a clean environment 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index cf027e7..8d572a3 100755 +index cf027e7d..8d572a33 100755 --- a/dracut.sh +++ b/dracut.sh @@ -545,6 +545,7 @@ export LC_ALL=C @@ -25,7 +25,7 @@ index cf027e7..8d572a3 100755 export DRACUT_LOG_LEVEL=warning diff --git a/install/dracut-install.c b/install/dracut-install.c -index 6b9c613..c5e4b05 100644 +index 6b9c613b..c5e4b05f 100644 --- a/install/dracut-install.c +++ b/install/dracut-install.c @@ -391,7 +391,11 @@ static int resolve_deps(const char *src) diff --git a/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch b/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch index 5fe499c..ab83c79 100644 --- a/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch +++ b/SOURCES/0076-systemd-add-71-seat.rules-73-seat-late.rules.patch @@ -9,7 +9,7 @@ otherwise plymouth does not work 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 7b3dfa4..7178d2b 100755 +index 7b3dfa40..7178d2ba 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -180,7 +180,7 @@ install() { diff --git a/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch b/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch index 0d3e83a..c937c81 100644 --- a/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch +++ b/SOURCES/0077-systemd-add-seat-udev-rules-and-mask-loginctl.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd: add seat udev rules and mask loginctl 1 file changed, 3 insertions(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 7178d2b..a99c699 100755 +index 7178d2ba..a99c699d 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -180,6 +180,9 @@ install() { diff --git a/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch b/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch index 4935c96..74b902b 100644 --- a/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch +++ b/SOURCES/0078-systemd-module-setup.sh-make-use-of-ln_r.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/module-setup.sh: make use of "ln_r" 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index a99c699..511b883 100755 +index a99c699d..511b883f 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -160,15 +160,15 @@ install() { diff --git a/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch b/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch index b73f81d..1ec4e74 100644 --- a/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch +++ b/SOURCES/0079-network-add-rd.bootif-0-to-ignore-BOOTIF.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1044623 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 8ac5341..963ba07 100644 +index 8ac53414..963ba074 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -484,6 +484,12 @@ interface name. Better name it "bootnet" or "bluesocket". @@ -27,7 +27,7 @@ index 8ac5341..963ba07 100644 specify nameserver(s) to use diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 4bf286d..7e73574 100755 +index 4bf286d8..7e735741 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -108,7 +108,7 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch b/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch index bb8c3ff..238e841 100644 --- a/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch +++ b/SOURCES/0080-iscsi-call-iscsistart-b-until-it-succeeds.patch @@ -9,7 +9,7 @@ Subject: [PATCH] iscsi: call "iscsistart -b" until it succeeds 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index abdea5c..156003c 100755 +index abdea5cf..156003c0 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -45,11 +45,20 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then @@ -35,7 +35,7 @@ index abdea5c..156003c 100755 fi diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 77bd991..e463add 100755 +index 77bd9913..e463addb 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -64,7 +64,7 @@ if [ -n "$iscsi_firmware" ] ; then diff --git a/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch b/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch index 51dc38a..b4fb4b8 100644 --- a/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch +++ b/SOURCES/0081-base-dracut-lib.sh-halt-the-machine-in-systemd-mode-.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1053655 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index a3476ab..e74b93f 100755 +index a3476ab3..e74b93fa 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1,4 +1,4 @@ diff --git a/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch b/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch index 98516dc..65b3328 100644 --- a/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch +++ b/SOURCES/0082-systemd-rootfs-generator.sh-exit-0.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/rootfs-generator.sh: exit 0 1 file changed, 2 insertions(+) diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh -index 3770c6b..555027f 100755 +index 3770c6b1..555027f3 100755 --- a/modules.d/98systemd/rootfs-generator.sh +++ b/modules.d/98systemd/rootfs-generator.sh @@ -28,3 +28,5 @@ case "$root" in diff --git a/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch b/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch index 1075dd5..5b56cb7 100644 --- a/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch +++ b/SOURCES/0083-systemd-rootfs-generator.sh-ignore-legacy-root-dev-n.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/rootfs-generator.sh: ignore legacy root=/dev/nfs 1 file changed, 2 insertions(+) diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh -index 555027f..9810026 100755 +index 555027f3..9810026d 100755 --- a/modules.d/98systemd/rootfs-generator.sh +++ b/modules.d/98systemd/rootfs-generator.sh @@ -22,6 +22,8 @@ case "$root" in diff --git a/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch b/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch index d2f7dcc..deba8eb 100644 --- a/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch +++ b/SOURCES/0084-dracut-lib.sh-fixed-shebang.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-lib.sh: fixed shebang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index e74b93f..cd62851 100755 +index e74b93fa..cd628519 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1,4 +1,4 @@ diff --git a/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch b/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch index 6ded99f..bfbb8a4 100644 --- a/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch +++ b/SOURCES/0085-iscsi-more-iscsiroot-fixes.patch @@ -10,7 +10,7 @@ handle iscsiroot with firmware more gracefully 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 156003c..6868710 100755 +index 156003c0..68687102 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -31,36 +31,45 @@ iroot="$2" @@ -120,7 +120,7 @@ index 156003c..6868710 100755 -exit 0 +exit $ret diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index e463add..4be9d56 100755 +index e463addb..4be9d561 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -61,10 +61,10 @@ fi diff --git a/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch b/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch index 18ca211..fe95bcc 100644 --- a/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch +++ b/SOURCES/0086-iscsiroot-touch-the-right-marker-file.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsiroot: touch the right marker file 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 6868710..60a180d 100755 +index 68687102..60a180dd 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -60,7 +60,7 @@ handle_firmware() diff --git a/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch b/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch index bf780d9..9b36b84 100644 --- a/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch +++ b/SOURCES/0087-lvm-lvm_scan.sh-handle-one-LV-at-a-time-with-lvchang.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lvm:lvm_scan.sh handle one LV at a time with lvchange 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh -index 85ecd4d..f87831c 100755 +index 85ecd4df..f87831c7 100755 --- a/modules.d/90lvm/lvm_scan.sh +++ b/modules.d/90lvm/lvm_scan.sh @@ -107,11 +107,13 @@ fi diff --git a/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch b/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch index be058ee..c4a5f78 100644 --- a/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch +++ b/SOURCES/0088-dracut-logger.sh-systemd-cat-only-understands-prio-0.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-logger.sh: systemd-cat only understands prio 0-7 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut-logger.sh b/dracut-logger.sh -index f679dc9..70b0da4 100755 +index f679dc94..70b0da4c 100755 --- a/dracut-logger.sh +++ b/dracut-logger.sh @@ -154,7 +154,7 @@ dlog_init() { diff --git a/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch b/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch index 68c18e9..6da7935 100644 --- a/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch +++ b/SOURCES/0089-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch @@ -12,7 +12,7 @@ Signed-off-by: Koen Kooi 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 8d572a3..ad57218 100755 +index 8d572a33..ad57218d 100755 --- a/dracut.sh +++ b/dracut.sh @@ -695,14 +695,12 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) diff --git a/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch b/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch index 4224db1..8de7492 100644 --- a/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch +++ b/SOURCES/0090-dracut-initramfs-restore-lsinitrd-add-LZ4-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Koen Kooi 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh -index ec5fe18..f29c814 100644 +index ec5fe180..f29c8146 100644 --- a/dracut-initramfs-restore.sh +++ b/dracut-initramfs-restore.sh @@ -20,6 +20,8 @@ if zcat "$IMG" | cpio -id --quiet >/dev/null; then @@ -29,7 +29,7 @@ index ec5fe18..f29c814 100644 # something failed, so we clean up echo "Unpacking of $IMG to /run/initramfs failed" >&2 diff --git a/lsinitrd.sh b/lsinitrd.sh -index 584c29a..f9f243b 100755 +index 584c29a9..f9f243bb 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -106,15 +106,17 @@ fi diff --git a/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch b/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch index b520da1..cb5250f 100644 --- a/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch +++ b/SOURCES/0091-Revert-dmraid-let-dmraid-setup-the-partitions.patch @@ -13,7 +13,7 @@ Reverting to kpartx, until this is fixed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh -index dfd0f1c..3753ddd 100755 +index dfd0f1cb..3753ddd7 100755 --- a/modules.d/90dmraid/dmraid.sh +++ b/modules.d/90dmraid/dmraid.sh @@ -27,7 +27,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then diff --git a/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch b/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch index da95d1a..27e698f 100644 --- a/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch +++ b/SOURCES/0092-dracut.sh-create-early-cpio-dir-for-acpi-tables.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: create early cpio dir for acpi tables 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index ad57218..5586275 100755 +index ad57218d..55862751 100755 --- a/dracut.sh +++ b/dracut.sh @@ -719,7 +719,7 @@ readonly initdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)" diff --git a/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch b/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch index f363926..e1f7bfc 100644 --- a/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch +++ b/SOURCES/0093-dracut.sh-set-file-owners-of-early-cpio-files-to-0-0.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: set file owners of early cpio files to 0:0 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 5586275..0ac2b05 100755 +index 55862751..0ac2b050 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1379,10 +1379,10 @@ rm -f -- "$outfile" diff --git a/SOURCES/0094-add-skipcpio-utility.patch b/SOURCES/0094-add-skipcpio-utility.patch index 06fcda1..82c70f8 100644 --- a/SOURCES/0094-add-skipcpio-utility.patch +++ b/SOURCES/0094-add-skipcpio-utility.patch @@ -13,7 +13,7 @@ It is used for skipping an early cpio archive for lsinitrd. create mode 100644 skipcpio/skipcpio.c diff --git a/Makefile b/Makefile -index e7da948..5441d8f 100644 +index e7da9484..5441d8f4 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages) @@ -61,7 +61,7 @@ index e7da948..5441d8f 100644 diff --git a/skipcpio/skipcpio.c b/skipcpio/skipcpio.c new file mode 100644 -index 0000000..fbf391b +index 00000000..fbf391bf --- /dev/null +++ b/skipcpio/skipcpio.c @@ -0,0 +1,123 @@ diff --git a/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch b/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch index 7dc4406..d0f5b56 100644 --- a/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch +++ b/SOURCES/0095-dracut.sh-add-early_cpio-marker-file-to-the-early-cp.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: add early_cpio marker file to the early cpio 1 file changed, 1 insertion(+) diff --git a/dracut.sh b/dracut.sh -index 0ac2b05..58acb64 100755 +index 0ac2b050..58acb647 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1378,6 +1378,7 @@ fi diff --git a/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch b/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch index 62f180b..2f2a342 100644 --- a/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch +++ b/SOURCES/0096-lsinitrd.sh-make-use-of-the-skipcpio-utility.patch @@ -10,7 +10,7 @@ early cpio image can be displayed. 1 file changed, 75 insertions(+), 21 deletions(-) diff --git a/lsinitrd.sh b/lsinitrd.sh -index f9f243b..70e12f8 100755 +index f9f243bb..70e12f81 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -33,6 +33,9 @@ usage() @@ -59,7 +59,7 @@ index f9f243b..70e12f8 100755 +fi + read -N 6 bin < "$image" - case $bin in ++case $bin in + $'\x71\xc7'*|070701) + CAT="cat --" + is_early=$(cpio --extract --verbose --quiet --to-stdout -- 'early_cpio' < "$image" 2>/dev/null) @@ -85,7 +85,7 @@ index f9f243b..70e12f8 100755 + read -N 6 bin < <($SKIP "$image") +fi + -+case $bin in + case $bin in $'\x1f\x8b'*) CAT="zcat --";; BZh*) diff --git a/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch b/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch index 68fcb3a..72ca57d 100644 --- a/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch +++ b/SOURCES/0097-network-dhclient-script.sh-set-lease-time.patch @@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1058519 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 07c3d9b..70a2b71 100755 +index 07c3d9be..70a2b710 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -12,6 +12,7 @@ setup_interface() { diff --git a/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch b/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch index dcb6dac..abfce22 100644 --- a/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch +++ b/SOURCES/0098-dracut-lib.sh-bugfix-for-pidof-function.patch @@ -12,7 +12,7 @@ Stig Telfer 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index cd62851..61e5a81 100755 +index cd628519..61e5a81a 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -969,7 +969,7 @@ if ! command -v pidof >/dev/null 2>/dev/null; then diff --git a/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch b/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch index 11c4630..eac4b9a 100644 --- a/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch +++ b/SOURCES/0099-dracut-lib.sh-bugfix-for-pidof-function.patch @@ -9,7 +9,7 @@ In follow-up, the patch requires a second mod: kernel tasks have a /proc/.../exe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 61e5a81..d892c26 100755 +index 61e5a81a..d892c26d 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -967,7 +967,7 @@ if ! command -v pidof >/dev/null 2>/dev/null; then diff --git a/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch b/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch index ab0bbbb..3c37c81 100644 --- a/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch +++ b/SOURCES/0100-iscsi-iscsiroot.sh-beautify-warning.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/iscsiroot.sh: beautify warning 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 60a180d..8b74332 100755 +index 60a180dd..8b743323 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -56,7 +56,7 @@ handle_firmware() diff --git a/SOURCES/0101-dracut.spec-add-skipcpio.patch b/SOURCES/0101-dracut.spec-add-skipcpio.patch index c4b284f..02f677d 100644 --- a/SOURCES/0101-dracut.spec-add-skipcpio.patch +++ b/SOURCES/0101-dracut.spec-add-skipcpio.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.spec: add skipcpio 1 file changed, 1 insertion(+) diff --git a/dracut.spec b/dracut.spec -index 596d728..d6f1a88 100644 +index 596d7283..d6f1a884 100644 --- a/dracut.spec +++ b/dracut.spec @@ -302,6 +302,7 @@ rm -rf -- $RPM_BUILD_ROOT diff --git a/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch b/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch index 4e734a4..4e70414 100644 --- a/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch +++ b/SOURCES/0102-systemd-ensure-autofs4-and-ipv6-are-included.patch @@ -13,7 +13,7 @@ thing to have them around. 1 file changed, 4 insertions(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 511b883..91a6559 100755 +index 511b883f..91a6559d 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -17,6 +17,10 @@ depends() { diff --git a/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch b/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch index 7b8a22b..4c282ea 100644 --- a/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch +++ b/SOURCES/0103-dracut-functions.sh-also-search-in-the-updates-direc.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-functions.sh: also search in the updates directory 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 2872516..96a20d5 100755 +index 2872516a..96a20d52 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1530,7 +1530,7 @@ find_kernel_modules_by_path () { diff --git a/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch b/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch index cd77ec4..01df545 100644 --- a/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch +++ b/SOURCES/0104-dracut.sh-only-set-the-owner-of-files-to-0-0-if-gene.patch @@ -12,7 +12,7 @@ generating an initramfs image. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 58acb64..4e23993 100755 +index 58acb647..4e239936 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1377,13 +1377,16 @@ fi diff --git a/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch b/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch index ba54819..ff8177b 100644 --- a/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch +++ b/SOURCES/0105-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.conf.d/fedora.conf.example: turn on early_microcode by 1 file changed, 1 insertion(+) diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example -index 495e8fb..2364b04 100644 +index 495e8fb3..2364b049 100644 --- a/dracut.conf.d/fedora.conf.example +++ b/dracut.conf.d/fedora.conf.example @@ -13,3 +13,4 @@ systemdsystemunitdir=/usr/lib/systemd/system diff --git a/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch b/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch index e554e6c..c8c925c 100644 --- a/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch +++ b/SOURCES/0106-network-understand-ip-.-dns1-dns2.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network: understand ip=.....:: 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 7544401..36fad12 100755 +index 7544401f..36fad122 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -339,7 +339,7 @@ ip_to_var() { diff --git a/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch b/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch index 25c5734..981750c 100644 --- a/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch +++ b/SOURCES/0107-network-ifup.sh-handle-dns1-and-dns2-from-ip-setting.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/ifup.sh: handle $dns1 and $dns2 from "ip=" settings 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 963ba07..985285b 100644 +index 963ba074..985285b4 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -472,6 +472,13 @@ cannot be used in conjunction with the **ifname** argument for the @@ -27,7 +27,7 @@ index 963ba07..985285b 100644 Assign network device name (ie "bootnet") to the NIC with MAC . diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 2edcfe6..b33981b 100755 +index 2edcfe69..b33981b2 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -264,18 +264,15 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then diff --git a/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch b/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch index d7f7021..44c1f86 100644 --- a/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch +++ b/SOURCES/0108-network-net-lib.sh-parse-ibft-nameserver-settings.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/net-lib.sh: parse ibft nameserver settings 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 36fad12..1b51c85 100755 +index 36fad122..1b51c856 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -185,6 +185,7 @@ ibft_to_cmdline() { diff --git a/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch b/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch index 284b005..d244031 100644 --- a/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch +++ b/SOURCES/0109-dmsquash-live-dmsquash-liveiso-genrules.sh-s-loop0-l.patch @@ -11,7 +11,7 @@ event, if the loop module is not manually loaded somewhere. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh b/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh -index 30ea180..0f913d7 100755 +index 30ea1805..0f913d79 100755 --- a/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh +++ b/modules.d/90dmsquash-live/dmsquash-liveiso-genrules.sh @@ -3,7 +3,7 @@ diff --git a/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch b/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch index 63f3b35..d3a98b3 100644 --- a/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch +++ b/SOURCES/0110-base-rdsosreport.sh-add-dracut-version-to-rdsosrepor.patch @@ -8,7 +8,7 @@ Subject: [PATCH] base/rdsosreport.sh: add dracut version to rdsosreport 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules.d/99base/rdsosreport.sh b/modules.d/99base/rdsosreport.sh -index 5e11166..3e2ac87 100755 +index 5e11166e..3e2ac87d 100755 --- a/modules.d/99base/rdsosreport.sh +++ b/modules.d/99base/rdsosreport.sh @@ -8,13 +8,7 @@ exec >/run/initramfs/rdsosreport.txt 2>&1 diff --git a/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch b/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch index 2bc699d..aaea4af 100644 --- a/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch +++ b/SOURCES/0111-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch @@ -13,7 +13,7 @@ Subject: [PATCH] fcoe: move uefi parsing to fcoe-uefi module diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh new file mode 100755 -index 0000000..007aa59 +index 00000000..007aa59a --- /dev/null +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -0,0 +1,22 @@ @@ -44,7 +44,7 @@ similarity index 100% rename from modules.d/95fcoe/parse-uefifcoe.sh rename to modules.d/95fcoe-uefi/parse-uefifcoe.sh diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 08ba4ea..d3c58cc 100755 +index 08ba4eac..d3c58cc6 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -32,7 +32,6 @@ install() { diff --git a/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch b/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch index b2d08f1..e711792 100644 --- a/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch +++ b/SOURCES/0112-move-uefi-lib-to-a-seperate-module.patch @@ -14,7 +14,7 @@ Subject: [PATCH] move uefi-lib to a seperate module rename modules.d/{99base => 99uefi-lib}/uefi-lib.sh (100%) diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 007aa59..653d88e 100755 +index 007aa59a..653d88eb 100755 --- a/modules.d/95fcoe-uefi/module-setup.sh +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -4,14 +4,12 @@ @@ -34,7 +34,7 @@ index 007aa59..653d88e 100755 } diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index d3c58cc..fe8e40a 100755 +index d3c58cc6..fe8e40aa 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -3,11 +3,6 @@ @@ -50,7 +50,7 @@ index d3c58cc..fe8e40a 100755 type -P $i >/dev/null || return 1 done diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index d33a0fb..52ce400 100755 +index d33a0fb4..52ce4004 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -42,7 +42,6 @@ install() { @@ -63,7 +63,7 @@ index d33a0fb..52ce400 100755 inst_multiple switch_root || dfatal "Failed to install switch_root" diff --git a/modules.d/99uefi-lib/module-setup.sh b/modules.d/99uefi-lib/module-setup.sh new file mode 100755 -index 0000000..4a856ea +index 00000000..4a856eaa --- /dev/null +++ b/modules.d/99uefi-lib/module-setup.sh @@ -0,0 +1,19 @@ diff --git a/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch b/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch index d2f1e53..b36d2fc 100644 --- a/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch +++ b/SOURCES/0113-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.spec: add 95fcoe-uefi and 99uefi-lib 1 file changed, 2 insertions(+) diff --git a/dracut.spec b/dracut.spec -index d6f1a88..302cfc5 100644 +index d6f1a884..302cfc5d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -413,6 +413,8 @@ rm -rf -- $RPM_BUILD_ROOT diff --git a/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch b/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch index 671fbcd..4ca08ab 100644 --- a/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch +++ b/SOURCES/0114-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fcoe-uefi: do not include, if fcoe utils not installed 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 653d88e..c91f775 100755 +index 653d88eb..c91f7754 100755 --- a/modules.d/95fcoe-uefi/module-setup.sh +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -4,6 +4,9 @@ diff --git a/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch b/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch index 25095ff..0c172e6 100644 --- a/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch +++ b/SOURCES/0115-network-fix-dns-parsing-in-ip-parameter.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network:fix dns parsing in ip= parameter 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 1b51c85..8948a47 100755 +index 1b51c856..8948a476 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -353,7 +353,7 @@ ip_to_var() { diff --git a/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch b/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch index 188ef05..5b2ce5a 100644 --- a/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch +++ b/SOURCES/0116-skipcpio-return-something-at-end-of-program.patch @@ -10,7 +10,7 @@ in theory undefined. 1 file changed, 2 insertions(+) diff --git a/skipcpio/skipcpio.c b/skipcpio/skipcpio.c -index fbf391b..c912061 100644 +index fbf391bf..c9120617 100644 --- a/skipcpio/skipcpio.c +++ b/skipcpio/skipcpio.c @@ -120,4 +120,6 @@ int main(int argc, char **argv) diff --git a/SOURCES/0117-skipcpio-fixed-signatured-check.patch b/SOURCES/0117-skipcpio-fixed-signatured-check.patch index bd3f37c..82273be 100644 --- a/SOURCES/0117-skipcpio-fixed-signatured-check.patch +++ b/SOURCES/0117-skipcpio-fixed-signatured-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] skipcpio: fixed signatured check 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skipcpio/skipcpio.c b/skipcpio/skipcpio.c -index c912061..ac0578e 100644 +index c9120617..ac0578ea 100644 --- a/skipcpio/skipcpio.c +++ b/skipcpio/skipcpio.c @@ -64,7 +64,7 @@ int main(int argc, char **argv) diff --git a/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch b/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch index cade690..3d738ce 100644 --- a/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch +++ b/SOURCES/0118-network-ifup-do-not-ifup-an-already-setup-network-in.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup: do not ifup an already setup network interface 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index b33981b..3a03d05 100755 +index b33981b2..3a03d052 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -80,7 +80,11 @@ fi diff --git a/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch b/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch index 6ff55e1..7bf032a 100644 --- a/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch +++ b/SOURCES/0119-network-ifup-do-not-run-dhclient-twice-on-the-same-i.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup: do not run dhclient twice on the same interface 1 file changed, 3 insertions(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 3a03d05..33ec81d 100755 +index 3a03d052..33ec81d1 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -91,6 +91,9 @@ do_dhcp() { diff --git a/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch b/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch index 9e87fb7..2972fff 100644 --- a/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch +++ b/SOURCES/0120-nfs-nfsroot-symlink-dev-null-to-dev-nfs-as-a-marker-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] nfs/nfsroot: symlink /dev/null to /dev/nfs, as a marker for 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95nfs/nfsroot.sh b/modules.d/95nfs/nfsroot.sh -index f04159e..d0719ef 100755 +index f04159e3..d0719efe 100755 --- a/modules.d/95nfs/nfsroot.sh +++ b/modules.d/95nfs/nfsroot.sh @@ -16,7 +16,7 @@ NEWROOT="$3" diff --git a/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch b/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch index 2dee6d5..179a873 100644 --- a/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch +++ b/SOURCES/0121-systemd-dracut-pre-pivot-run-for-dev-nfs-root-and-cl.patch @@ -12,7 +12,7 @@ up /dev/root. 2 files changed, 3 insertions(+) diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service -index dd4e49b..6db1f2c 100644 +index dd4e49b4..6db1f2c0 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -19,6 +19,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cleanup @@ -25,7 +25,7 @@ index dd4e49b..6db1f2c 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh -index 8c7554e..e62a1ce 100755 +index 8c7554ea..e62a1cec 100755 --- a/modules.d/98systemd/dracut-pre-pivot.sh +++ b/modules.d/98systemd/dracut-pre-pivot.sh @@ -24,5 +24,6 @@ getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switc diff --git a/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch b/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch index 3fc4b95..2683500 100644 --- a/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch +++ b/SOURCES/0122-new_dhcp_next_server-is-really-new_next_server.patch @@ -11,7 +11,7 @@ dhcp server. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh -index f5fc56d..9ced2e6 100755 +index f5fc56d7..9ced2e69 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -97,7 +97,7 @@ nfsroot_from_dhcp() { diff --git a/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch b/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch index 5638317..8d78600 100644 --- a/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch +++ b/SOURCES/0123-dracut.sh-Fix-variable-name-typo.patch @@ -16,7 +16,7 @@ swap partition on the host device is still added however. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 4e23993..89df9cd 100755 +index 4e239936..89df9cd8 100755 --- a/dracut.sh +++ b/dracut.sh @@ -926,7 +926,7 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch b/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch index 4f5b577..4212601 100644 --- a/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch +++ b/SOURCES/0124-kernel-modules-add-sdhci_acpi-to-the-static-list-of-.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1063556 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index f4db6aa..a7803d0 100755 +index f4db6aa8..a7803d00 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -45,7 +45,8 @@ installkernel() { diff --git a/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch b/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch index f76e898..e0d3b49 100644 --- a/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch +++ b/SOURCES/0125-dracut-functions.sh-find_kernel_modules_by_path-fixe.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut-functions.sh:find_kernel_modules_by_path() fixed 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 96a20d5..bddcdcf 100755 +index 96a20d52..bddcdcf2 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1530,7 +1530,7 @@ find_kernel_modules_by_path () { diff --git a/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch b/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch index 79f8ab6..3ff74e1 100644 --- a/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch +++ b/SOURCES/0126-iscsi-for-iBFT-read-the-initiator-name-from-the-corr.patch @@ -12,7 +12,7 @@ https://github.com/haraldh/dracut/issues/12 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 8b74332..54f4990 100755 +index 8b743323..54f49903 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -125,7 +125,7 @@ handle_netroot() diff --git a/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch b/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch index 66a8655..5c9caac 100644 --- a/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch +++ b/SOURCES/0127-fcoe-uefi-try-all-FcoeBootDevice-variables-for-a-Dev.patch @@ -11,7 +11,7 @@ until one has a MAC. 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules.d/95fcoe-uefi/parse-uefifcoe.sh b/modules.d/95fcoe-uefi/parse-uefifcoe.sh -index e03bcb3..0799cdd 100755 +index e03bcb39..0799cdd6 100755 --- a/modules.d/95fcoe-uefi/parse-uefifcoe.sh +++ b/modules.d/95fcoe-uefi/parse-uefifcoe.sh @@ -9,10 +9,10 @@ command -v set_ifname >/dev/null || . /lib/net-lib.sh diff --git a/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch b/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch index da5a93b..61e7cee 100644 --- a/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch +++ b/SOURCES/0128-dracut.sh-write-directly-to-the-output-file.patch @@ -10,7 +10,7 @@ have to play games and write to a temporary file first. 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 89df9cd..c4bf4eb 100755 +index 89df9cd8..c4bf4ebc 100755 --- a/dracut.sh +++ b/dracut.sh @@ -729,7 +729,6 @@ fi diff --git a/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch b/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch index 1fe81df..e80334c 100644 --- a/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch +++ b/SOURCES/0129-systemd-add-sys-kernel-config.mount.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd: add sys-kernel-config.mount 1 file changed, 4 insertions(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 91a6559..5081a5a 100755 +index 91a6559d..5081a5ab 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -41,6 +41,7 @@ install() { diff --git a/SOURCES/0130-systemd-add-70-uaccess.rules.patch b/SOURCES/0130-systemd-add-70-uaccess.rules.patch index ef4bfa4..63d34a7 100644 --- a/SOURCES/0130-systemd-add-70-uaccess.rules.patch +++ b/SOURCES/0130-systemd-add-70-uaccess.rules.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd: add 70-uaccess.rules 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 5081a5a..429781b 100755 +index 5081a5ab..429781b2 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -191,7 +191,7 @@ install() { diff --git 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 index 4fd3401..c335779 100644 --- 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 @@ -20,7 +20,7 @@ Subject: [PATCH] Add flag to toggle hostonly cmdline storing in the initramfs 8 files changed, 66 insertions(+), 25 deletions(-) diff --git a/dracut.8.asc b/dracut.8.asc -index b294675..ba125c0 100644 +index b2946753..ba125c0d 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -294,6 +294,12 @@ provide a valid _/etc/fstab_. @@ -37,7 +37,7 @@ index b294675..ba125c0 100644 Use __ to address disks and partitions. __ can be any directory name found in /dev/disk. diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index 5c94118..be62da9 100644 +index 5c941188..be62da98 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -76,6 +76,9 @@ Configuration files must have the extension .conf; other extensions are ignored. @@ -51,7 +51,7 @@ index 5c94118..be62da9 100644 Use __ to address disks and partitions. __ can be any directory name found in /dev/disk. diff --git a/dracut.sh b/dracut.sh -index c4bf4eb..1c5e688 100755 +index c4bf4ebc..1c5e6889 100755 --- a/dracut.sh +++ b/dracut.sh @@ -136,6 +136,10 @@ Creates initial ramdisk images for preloading modules @@ -128,7 +128,7 @@ index c4bf4eb..1c5e688 100755 [[ $use_fstab_l ]] && use_fstab=$use_fstab_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index 1858391..267d39d 100755 +index 18583915..267d39d5 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -46,8 +46,10 @@ cmdline() { @@ -145,7 +145,7 @@ index 1858391..267d39d 100755 inst_multiple cryptsetup rmdir readlink umount inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh -index 11181cf..b230cb0 100755 +index 11181cf5..b230cb0e 100755 --- a/modules.d/90dmraid/module-setup.sh +++ b/modules.d/90dmraid/module-setup.sh @@ -61,8 +61,10 @@ cmdline() { @@ -162,7 +162,7 @@ index 11181cf..b230cb0 100755 inst_multiple dmraid inst_multiple -o kpartx diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index f0c9b96..1c962d5 100755 +index f0c9b964..1c962d54 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -48,8 +48,10 @@ install() { @@ -179,7 +179,7 @@ index f0c9b96..1c962d5 100755 inst_rules "$moddir/64-lvm.rules" diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 34aae1e..1e03847 100755 +index 34aae1e3..1e03847f 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -65,8 +65,10 @@ install() { @@ -196,7 +196,7 @@ index 34aae1e..1e03847 100755 # $hookdir/initqueue/finished/dhclient-$netif.sh - >/tmp/net.$netif.up - ;; +@@ -95,6 +121,29 @@ case $reason in + echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh" + } > $hookdir/initqueue/setup_net_$netif.sh + ++ echo "[ -f /tmp/setup_net_$netif.ok ]" > $hookdir/initqueue/finished/dhclient-$netif.sh ++ >/tmp/net.$netif.up ++ ;; + + BOUND6) + echo "dhcp: BOND6 setting $netif" @@ -78,9 +81,6 @@ index 70a2b71..a9c2523 100755 + echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh" + } > $hookdir/initqueue/setup_net_$netif.sh + -+ echo "[ -f /tmp/setup_net_$netif.ok ]" > $hookdir/initqueue/finished/dhclient-$netif.sh -+ >/tmp/net.$netif.up -+ ;; - *) echo "dhcp: $reason";; - esac - + echo "[ -f /tmp/setup_net_$netif.ok ]" > $hookdir/initqueue/finished/dhclient-$netif.sh + >/tmp/net.$netif.up + ;; diff --git a/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch b/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch index 147eb85..59773d4 100644 --- a/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch +++ b/SOURCES/0137-network-IPv6-status-wait-for-tentative-flag-to-be-cl.patch @@ -10,7 +10,7 @@ also do not arping the IPv6 address. 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 33ec81d..e439106 100755 +index 33ec81d1..e4391068 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -136,6 +136,7 @@ do_static() { @@ -22,7 +22,7 @@ index 33ec81d..e439106 100755 ip addr flush dev $netif ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 4e1b019..a586711 100755 +index 4e1b0192..a5867118 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -123,8 +123,8 @@ setup_net() { diff --git a/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch b/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch index aa65db1..f82f00b 100644 --- a/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch +++ b/SOURCES/0138-network-merge-setup_net_-netif.ok-and-net.-netif.did.patch @@ -13,7 +13,7 @@ one marker per interface is enough 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index a9c2523..822cce9 100755 +index a9c25238..822cce95 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -116,12 +116,10 @@ case $reason in @@ -45,7 +45,7 @@ index a9c2523..822cce9 100755 ;; *) echo "dhcp: $reason";; diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index e439106..02dfc94 100755 +index e4391068..02dfc947 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -83,7 +83,9 @@ fi @@ -86,7 +86,7 @@ index e439106..02dfc94 100755 fi diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index c4def61..af2f09c 100755 +index c4def61b..af2f09c1 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -89,7 +89,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh @@ -99,7 +99,7 @@ index c4def61..af2f09c 100755 done # Default: We don't know the interface to use, handle all diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index a586711..7430e4c 100755 +index a5867118..7430e4ce 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -82,12 +82,16 @@ ifdown() { @@ -129,7 +129,7 @@ index a586711..7430e4c 100755 save_netinfo() { diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index d9e9f3a..e2fa485 100755 +index d9e9f3af..e2fa4850 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -85,6 +85,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0139-systemd-add-systemd-sysctl-service.patch b/SOURCES/0139-systemd-add-systemd-sysctl-service.patch index 9ba85f2..b6aaaca 100644 --- a/SOURCES/0139-systemd-add-systemd-sysctl-service.patch +++ b/SOURCES/0139-systemd-add-systemd-sysctl-service.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1070086 1 file changed, 2 insertions(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 429781b..52edd80 100755 +index 429781b2..52edd80e 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -94,6 +94,7 @@ install() { diff --git a/SOURCES/0140-add-default-values-in-fstab_lines.patch b/SOURCES/0140-add-default-values-in-fstab_lines.patch index 789e473..ce5175f 100644 --- a/SOURCES/0140-add-default-values-in-fstab_lines.patch +++ b/SOURCES/0140-add-default-values-in-fstab_lines.patch @@ -22,7 +22,7 @@ Signed-off-by: Dave Young 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dracut.8.asc b/dracut.8.asc -index ba125c0..f97074a 100644 +index ba125c0d..f97074a2 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -311,9 +311,13 @@ provide a valid _/etc/fstab_. @@ -43,7 +43,7 @@ index ba125c0..f97074a 100644 **--add-device** __ :: Bring up __ in initramfs, __ should be the device name. diff --git a/dracut.sh b/dracut.sh -index 1c5e688..2d5b7dc 100755 +index 1c5e6889..2d5b7dc7 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1234,7 +1234,11 @@ if [[ $kernel_only != yes ]]; then diff --git a/SOURCES/0141-test-add-missing-Makefile.testdir.patch b/SOURCES/0141-test-add-missing-Makefile.testdir.patch index 969b4c1..23ef699 100644 --- a/SOURCES/0141-test-add-missing-Makefile.testdir.patch +++ b/SOURCES/0141-test-add-missing-Makefile.testdir.patch @@ -10,7 +10,7 @@ Subject: [PATCH] test: add missing Makefile.testdir diff --git a/test/Makefile.testdir b/test/Makefile.testdir new file mode 100644 -index 0000000..33c2a9a +index 00000000..33c2a9a4 --- /dev/null +++ b/test/Makefile.testdir @@ -0,0 +1,12 @@ diff --git a/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch b/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch index 9ce8905..520ff52 100644 --- a/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch +++ b/SOURCES/0142-test-Makefile-add-SKIP-env-to-skip-certain-tests.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/Makefile: add SKIP env to skip certain tests 1 file changed, 1 insertion(+) diff --git a/test/Makefile b/test/Makefile -index 97a7aad..f71f854 100644 +index 97a7aad8..f71f8540 100644 --- a/test/Makefile +++ b/test/Makefile @@ -6,6 +6,7 @@ check: diff --git a/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch b/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch index 61fdcf8..6a22426 100644 --- a/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch +++ b/SOURCES/0143-test-TEST-50-MULTINIC-client-init.sh-skip-MAC-marker.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/TEST-50-MULTINIC/client-init.sh: skip MAC marker files 1 file changed, 1 insertion(+) diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-50-MULTINIC/client-init.sh -index f13c379..51f8b64 100755 +index f13c3790..51f8b642 100755 --- a/test/TEST-50-MULTINIC/client-init.sh +++ b/test/TEST-50-MULTINIC/client-init.sh @@ -9,6 +9,7 @@ export PS1='initramfs-test:\w\$ ' diff --git a/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch b/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch index 48d6c85..a3f0c0e 100644 --- a/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch +++ b/SOURCES/0144-Add-no-hostonly-cmdline-option-handling-for-getopt.patch @@ -12,7 +12,7 @@ Signed-off-by: WANG Chao 1 file changed, 2 insertions(+) diff --git a/dracut.sh b/dracut.sh -index 2d5b7dc..78d7fad 100755 +index 2d5b7dc7..78d7fadd 100755 --- a/dracut.sh +++ b/dracut.sh @@ -347,6 +347,8 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \ diff --git a/SOURCES/0145-dracut-don-t-let-devices-timeout.patch b/SOURCES/0145-dracut-don-t-let-devices-timeout.patch index af8c6a9..e93f0fd 100644 --- a/SOURCES/0145-dracut-don-t-let-devices-timeout.patch +++ b/SOURCES/0145-dracut-don-t-let-devices-timeout.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=949697 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh -index a11ce59..2c09895 100755 +index a11ce595..2c098951 100755 --- a/modules.d/98systemd/rootfs-generator.sh +++ b/modules.d/98systemd/rootfs-generator.sh @@ -29,7 +29,7 @@ generator_wait_for_dev() @@ -23,7 +23,7 @@ index a11ce59..2c09895 100755 fi } diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index d892c26..62facda 100755 +index d892c26d..62facda1 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -884,7 +884,7 @@ wait_for_dev() diff --git 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 index c65863a..9e92669 100644 --- 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 @@ -9,7 +9,7 @@ Subject: [PATCH] Do not wait_for_dev if hostonly_cmdline not set 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 78d7fad..95f18db 100755 +index 78d7fadd..95f18dbf 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1076,7 +1076,7 @@ export initdir dracutbasedir dracutmodules \ @@ -22,7 +22,7 @@ index 78d7fad..95f18db 100755 mods_to_load="" # check all our modules to see if they should be sourced. diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index 52ce400..fddf4b0 100755 +index 52ce4004..fddf4b06 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -92,24 +92,26 @@ install() { diff --git a/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch b/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch index 3a7df59..0141bf7 100644 --- a/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch +++ b/SOURCES/0147-systemd-dracut-shutdown.service-make-failure-non-fat.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/dracut-shutdown.service: make failure non-fatal 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/dracut-shutdown.service b/modules.d/98systemd/dracut-shutdown.service -index e733300..3b8b6da 100644 +index e733300c..3b8b6da6 100644 --- a/modules.d/98systemd/dracut-shutdown.service +++ b/modules.d/98systemd/dracut-shutdown.service @@ -15,6 +15,6 @@ ConditionPathExists=/run/initramfs/.need_shutdown diff --git a/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch b/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch index eca9909..0cef898 100644 --- a/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch +++ b/SOURCES/0148-network-dhclient-script-do-PREINIT6-for-DHCP6.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network:dhclient-script do PREINIT6 for DHCP6 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 822cce9..50e8932 100755 +index 822cce95..50e89326 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -2,6 +2,17 @@ @@ -62,7 +62,7 @@ index 822cce9..50e8932 100755 echo "dhcp: BOND setting $netif" unset layer2 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 02dfc94..51b0d52 100755 +index 02dfc947..51b0d528 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -328,6 +328,7 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch b/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch index f50f81c..d09b426 100644 --- a/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch +++ b/SOURCES/0149-shutdown-if-kexec-failed-do-a-simple-reboot.patch @@ -8,7 +8,7 @@ Subject: [PATCH] shutdown: if kexec failed, do a simple reboot 1 file changed, 1 insertion(+) diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh -index 162abcb..1daf2ca 100755 +index 162abcb9..1daf2ca3 100755 --- a/modules.d/99shutdown/shutdown.sh +++ b/modules.d/99shutdown/shutdown.sh @@ -113,6 +113,7 @@ case "$ACTION" in diff --git a/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch b/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch index 4236601..3daca33 100644 --- a/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch +++ b/SOURCES/0150-dracut-initramfs-restore-fix-unpacking-with-early-mi.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut-initramfs-restore: fix unpacking with early microcode 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh -index f29c814..0dd1938 100644 +index f29c8146..0dd1938d 100644 --- a/dracut-initramfs-restore.sh +++ b/dracut-initramfs-restore.sh @@ -6,6 +6,10 @@ set -e diff --git a/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch b/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch index 8b9b426..610970e 100644 --- a/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch +++ b/SOURCES/0151-fcoe-wait-for-lldpad-to-be-ready.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1080353 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index ecb1593..60642cf 100755 +index ecb1593d..60642cfd 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -31,8 +31,14 @@ if [ "$dcb" = "dcb" ]; then @@ -31,7 +31,7 @@ index ecb1593..60642cf 100755 sleep 1 dcbtool sc "$netif" app:fcoe e:1 a:1 w:1 diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index fe8e40a..3ffaf5a 100755 +index fe8e40aa..3ffaf5a5 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -20,7 +20,7 @@ installkernel() { diff --git a/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch b/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch index 9e0e749..5b4c6e6 100644 --- a/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch +++ b/SOURCES/0152-network-handle-ip-dhcp6-for-all-interfaces.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1064365 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 51b0d52..ede0188 100755 +index 51b0d528..ede01883 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -364,7 +364,12 @@ fi diff --git a/SOURCES/0153-lsinitrd.sh-prevent-construct.patch b/SOURCES/0153-lsinitrd.sh-prevent-construct.patch index 745b5bd..e3bd53e 100644 --- a/SOURCES/0153-lsinitrd.sh-prevent-construct.patch +++ b/SOURCES/0153-lsinitrd.sh-prevent-construct.patch @@ -21,7 +21,7 @@ foo < <$(bar) 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/lsinitrd.sh b/lsinitrd.sh -index 70e12f8..2fbebd8 100755 +index 70e12f81..2fbebd8e 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -160,27 +160,36 @@ case $bin in diff --git a/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch b/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch index dc46150..82e88dd 100644 --- a/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch +++ b/SOURCES/0154-network-DCHPv6-set-valid_lft-and-preferred_lft.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1064365 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 50e8932..ba05250 100755 +index 50e89326..ba05250d 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -64,13 +64,17 @@ setup_interface6() { diff --git a/SOURCES/0155-dm-add-dm-cache-modules.patch b/SOURCES/0155-dm-add-dm-cache-modules.patch index 33dba80..654a470 100644 --- a/SOURCES/0155-dm-add-dm-cache-modules.patch +++ b/SOURCES/0155-dm-add-dm-cache-modules.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1081435 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh -index fa38e85..1fd9298 100755 +index fa38e856..1fd92987 100755 --- a/modules.d/90dm/module-setup.sh +++ b/modules.d/90dm/module-setup.sh @@ -13,7 +13,7 @@ depends() { diff --git a/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch b/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch index 60280b2..88c1f5d 100644 --- a/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch +++ b/SOURCES/0156-fcoe-workaround-fcoe-timing-issues.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fcoe: workaround fcoe timing issues 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/modules.d/95fcoe/fcoe-genrules.sh b/modules.d/95fcoe/fcoe-genrules.sh -index 80894ed..fa3af6d 100755 +index 80894ed2..fa3af6df 100755 --- a/modules.d/95fcoe/fcoe-genrules.sh +++ b/modules.d/95fcoe/fcoe-genrules.sh @@ -13,4 +13,4 @@ @@ -19,7 +19,7 @@ index 80894ed..fa3af6d 100755 -} > /etc/udev/rules.d/92-fcoe.rules +} >> /etc/udev/rules.d/92-fcoe.rules diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index 60642cf..edbfcc8 100755 +index 60642cfd..edbfcc84 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -39,10 +39,27 @@ if [ "$dcb" = "dcb" ]; then diff --git a/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch b/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch index f45a660..56a7f6b 100644 --- a/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch +++ b/SOURCES/0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch @@ -12,7 +12,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=502102 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 95f18db..a5fcf38 100755 +index 95f18dbf..a5fcf389 100755 --- a/dracut.sh +++ b/dracut.sh @@ -720,7 +720,7 @@ case $compress in @@ -25,7 +25,7 @@ index 95f18db..a5fcf38 100755 if [[ $_no_compress_l = "cat" ]]; then compress="cat" diff --git a/lsinitrd.sh b/lsinitrd.sh -index 2fbebd8..7b12ab9 100755 +index 2fbebd8e..7b12ab96 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -178,7 +178,7 @@ CAT=$({ diff --git a/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch b/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch index c8028e2..d87dbd2 100644 --- a/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch +++ b/SOURCES/0158-fs-lib-always-install-fsck.-fs-if-present.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fs-lib: always install fsck.$fs, if present 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh -index c9c88b7..249aa84 100755 +index c9c88b7d..249aa84a 100755 --- a/modules.d/99fs-lib/module-setup.sh +++ b/modules.d/99fs-lib/module-setup.sh @@ -15,10 +15,10 @@ echo_fs_helper() { diff --git a/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch b/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch index 303048a..441787d 100644 --- a/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch +++ b/SOURCES/0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch @@ -11,7 +11,7 @@ ifcfg file. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index e2fa485..486c69a 100755 +index e2fa4850..486c69a3 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -122,7 +122,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch index 11ffe95..177661a 100644 --- a/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch +++ b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1086291 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index bddcdcf..cb43f7a 100755 +index bddcdcf2..cb43f7ad 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1530,7 +1530,7 @@ find_kernel_modules_by_path () { diff --git a/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch b/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch index 81c074e..af4f6ad 100644 --- a/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch +++ b/SOURCES/0161-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch @@ -19,7 +19,7 @@ Signed-off-by: WANG Chao 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh -index 12711a0..a237810 100755 +index 12711a07..a2378101 100755 --- a/modules.d/95fstab-sys/mount-sys.sh +++ b/modules.d/95fstab-sys/mount-sys.sh @@ -27,7 +27,11 @@ fstab_mount() { diff --git a/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch b/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch index 62c4b3a..2e50ea7 100644 --- a/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch +++ b/SOURCES/0162-lvm-module-setup.sh-check-for-existance-of-69-dm-lvm.patch @@ -14,7 +14,7 @@ distributions (debian), which do not ship these rules. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 1c962d5..4a49fc7 100755 +index 1c962d54..4a49fc7d 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -78,7 +78,8 @@ install() { diff --git a/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch b/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch index 81aaeb3..25bb693 100644 --- a/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch +++ b/SOURCES/0163-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch @@ -24,7 +24,7 @@ Signed-off-by: WANG Chao 1 file changed, 2 insertions(+) diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service -index 03dcc4e..1b9e701 100644 +index 03dcc4eb..1b9e701b 100644 --- a/modules.d/98systemd/dracut-initqueue.service +++ b/modules.d/98systemd/dracut-initqueue.service @@ -11,6 +11,8 @@ diff --git a/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch b/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch index 6ef6df2..152850e 100644 --- a/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch +++ b/SOURCES/0164-ifcfg-do-not-bind-persistent-interface-names-to-HWAD.patch @@ -10,7 +10,7 @@ Subject: [PATCH] ifcfg: do not bind persistent interface names to HWADDR 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 7430e4c..5d4ae32 100755 +index 7430e4ce..5d4ae32c 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -516,3 +516,30 @@ find_iface_with_link() { @@ -45,7 +45,7 @@ index 7430e4c..5d4ae32 100755 + return 0 +} diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 486c69a..2631fbe 100755 +index 486c69a3..2631fbe2 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -164,7 +164,11 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch b/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch index 2ef6ee1..c768dda 100644 --- a/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch +++ b/SOURCES/0165-ifcfg-only-bind-to-HWADDR-if-addr_assign_type-0.patch @@ -13,7 +13,7 @@ interfaces 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 5d4ae32..d53e1a6 100755 +index 5d4ae32c..d53e1a6e 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -518,9 +518,6 @@ find_iface_with_link() { @@ -27,7 +27,7 @@ index 5d4ae32..d53e1a6 100755 # udev persistent interface names eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 2631fbe..5dc351d 100755 +index 2631fbe2..5dc351d5 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -166,6 +166,8 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch b/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch index c49995c..259941c 100644 --- a/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch +++ b/SOURCES/0166-dracut-lib.sh-fixed-return-value-of-pidof.patch @@ -14,7 +14,7 @@ Thanks "Consus" for the hint! 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 62facda..66977e7 100755 +index 62facda1..66977e73 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -962,6 +962,7 @@ if ! command -v pidof >/dev/null 2>/dev/null; then diff --git a/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch b/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch index 44d2dc7..73813bf 100644 --- a/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch +++ b/SOURCES/0167-Do-not-log-to-kmsg-syslog-and-files-for-print-cmdlin.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Do not log to kmsg/syslog and files for "--print-cmdline" 1 file changed, 8 insertions(+) diff --git a/dracut.sh b/dracut.sh -index a5fcf38..705f090 100755 +index a5fcf389..705f090a 100755 --- a/dracut.sh +++ b/dracut.sh @@ -758,6 +758,13 @@ trap 'exit 1;' SIGINT diff --git a/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch b/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch index 7ae6151..91ae963 100644 --- a/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch +++ b/SOURCES/0168-ifcfg-write-ifcfg.sh-IPV6INIT-yes-check-also-for-non.patch @@ -9,7 +9,7 @@ Subject: [PATCH] ifcfg/write-ifcfg.sh: "IPV6INIT=yes" check also for non-dhcp 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 5dc351d..457a9ac 100755 +index 5dc351d5..457a9ac4 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -120,9 +120,9 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch b/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch index 36dd744..bc27371 100644 --- a/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch +++ b/SOURCES/0169-cms-cmssetup.sh-convert-SUBCHANNELS-to-lowercase.patch @@ -11,7 +11,7 @@ In udev rules, the channels need to be expressed in lower case. 1 file changed, 1 insertion(+) diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh -index 36955bc..c9e1331 100755 +index 36955bc3..c9e13314 100755 --- a/modules.d/80cms/cmssetup.sh +++ b/modules.d/80cms/cmssetup.sh @@ -144,6 +144,7 @@ function dasd_settle_all() { diff --git a/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch b/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch index 080f589..34dcf96 100644 --- a/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch +++ b/SOURCES/0170-mdraid-module-setup.sh-fixed-print-cmdline-for-empty.patch @@ -16,7 +16,7 @@ Thanks to Jan ONDREJ for spotting this! 1 file changed, 2 insertions(+) diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 1e03847..815a3eb 100755 +index 1e03847f..815a3ebc 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -50,6 +50,8 @@ cmdline() { diff --git a/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch b/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch index 1b4e304..f68a004 100644 --- a/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch +++ b/SOURCES/0171-ifcfg-write-ifcfg.sh-include-net-lib.sh.patch @@ -11,7 +11,7 @@ otherwise is_persistent_ethernet_name() is missing 1 file changed, 2 insertions(+) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 457a9ac..7f997a2 100755 +index 457a9ac4..7f997a2a 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -3,6 +3,8 @@ diff --git a/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch b/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch index 9e3035c..476b79b 100644 --- a/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch +++ b/SOURCES/0172-nbd-nbdroot.sh-call-nbd-client-with-systemd-mark.patch @@ -11,7 +11,7 @@ otherwise nbd-client will get killed by systemd 1 file changed, 4 insertions(+) diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh -index 2e9d917..ddb3819 100755 +index 2e9d9174..ddb38192 100755 --- a/modules.d/95nbd/nbdroot.sh +++ b/modules.d/95nbd/nbdroot.sh @@ -111,6 +111,10 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then diff --git a/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch b/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch index bb952f3..906bb64 100644 --- a/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch +++ b/SOURCES/0173-fcoe-uefi-parse-uefifcoe.sh-fixed-parameter-generati.patch @@ -12,7 +12,7 @@ Subject: [PATCH] fcoe-uefi/parse-uefifcoe.sh: fixed parameter generation from 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95fcoe-uefi/parse-uefifcoe.sh b/modules.d/95fcoe-uefi/parse-uefifcoe.sh -index 0799cdd..7b8f1a6 100755 +index 0799cdd6..7b8f1a6f 100755 --- a/modules.d/95fcoe-uefi/parse-uefifcoe.sh +++ b/modules.d/95fcoe-uefi/parse-uefifcoe.sh @@ -26,7 +26,7 @@ print_fcoe_uefi_conf() diff --git a/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch b/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch index 868f436..7d88245 100644 --- a/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch +++ b/SOURCES/0174-dracut-functions.sh-print_vars-fix-for-values-with-s.patch @@ -23,7 +23,7 @@ Thanks to Sebastian Köln for the fix! 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index cb43f7a..915f70f 100755 +index cb43f7ad..915f70fa 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -176,7 +176,7 @@ print_vars() { diff --git a/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch b/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch index d936b63..0e830e7 100644 --- a/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch +++ b/SOURCES/0175-98systemd-fixup-rootfs-generator-installation-path.patch @@ -15,7 +15,7 @@ Signed-off-by: Hannes Reinecke 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 52edd80..36a0505 100755 +index 52edd80e..36a0505b 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -188,7 +188,7 @@ install() { diff --git a/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch b/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch index 8988814..4f7272a 100644 --- a/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch +++ b/SOURCES/0176-dracut-pre-pivot-pulls-in-remote-fs.target.patch @@ -15,7 +15,7 @@ Signed-off-by: WANG Chao 1 file changed, 2 insertions(+) diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service -index 6db1f2c..d7c7b1d 100644 +index 6db1f2c0..d7c7b1d7 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -13,6 +13,8 @@ Documentation=man:dracut-pre-pivot.service(8) diff --git a/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch b/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch index 1a4273d..d11c4df 100644 --- a/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch +++ b/SOURCES/0177-kernel-modules-Fix-storage-module-selection-for-sdhc.patch @@ -25,7 +25,7 @@ Signed-off-by: 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index a7803d0..603a7a1 100755 +index a7803d00..603a7a19 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -5,7 +5,7 @@ diff --git a/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch b/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch index dc2e9e2..e2c1ac1 100644 --- a/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch +++ b/SOURCES/0178-bonding-use-hwaddr-of-the-slave-rather-than-the-mast.patch @@ -20,7 +20,7 @@ configuration file. 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index ede0188..fd84e4c 100755 +index ede01883..fd84e4cd 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -188,6 +188,7 @@ if [ -e /tmp/bond.${netif}.info ]; then @@ -32,7 +32,7 @@ index ede0188..fd84e4c 100755 linkup $slave done diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 7f997a2..fb388bc 100755 +index 7f997a2a..fb388bcb 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -206,7 +206,11 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch b/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch index fd460ea..5858e6d 100644 --- a/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch +++ b/SOURCES/0179-network-ifup.sh-Don-t-try-to-modprobe-ipv6-if-alread.patch @@ -15,7 +15,7 @@ Simplified logic. 1 file changed, 1 insertion(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index fd84e4c..79127f2 100755 +index fd84e4cd..79127f24 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -106,6 +106,7 @@ do_dhcp() { diff --git a/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch b/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch index 30eff42..abda465 100644 --- a/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch +++ b/SOURCES/0180-iscsi-correctly-install-the-timeout-iscsiroot-dummy-.patch @@ -11,7 +11,7 @@ initqueue parses $1 as the executable command 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 4be9d56..52a4805 100755 +index 4be9d561..52a4805a 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -64,7 +64,7 @@ if [ -n "$iscsi_firmware" ] ; then diff --git a/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch b/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch index c7bcdf5..7e2112f 100644 --- a/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch +++ b/SOURCES/0181-iscsi-correctly-install-the-settled-iscsiroot-dummy-.patch @@ -11,7 +11,7 @@ initqueue parses $1 as the executable command 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 52a4805..b48be38 100755 +index 52a4805a..b48be387 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -88,7 +88,7 @@ fi diff --git a/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch b/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch index 4fcdc32..d5020db 100644 --- a/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch +++ b/SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch @@ -19,7 +19,7 @@ Also removed the trigger of the warning: 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 985285b..10550ee 100644 +index 985285b4..10550eef 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -437,7 +437,7 @@ USB Android phone:: @@ -51,7 +51,7 @@ index 985285b..10550ee 100644 ~~~~ **fcoe=**____:__{dcb|nodcb}__:: diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh -index 9776c75..643313d 100755 +index 9776c755..643313dc 100755 --- a/modules.d/40network/parse-ibft.sh +++ b/modules.d/40network/parse-ibft.sh @@ -5,6 +5,6 @@ @@ -65,7 +65,7 @@ index 9776c75..643313d 100755 + ibft_to_cmdline +fi diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 7e73574..b029d00 100755 +index 7e735741..b029d007 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -25,6 +25,10 @@ fi diff --git a/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch b/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch index 26c41a2..33a744d 100644 --- a/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch +++ b/SOURCES/0183-systemd-Optionally-include-efivarsfs-module.patch @@ -11,7 +11,7 @@ It is, however not an error if this module can't be found. 1 file changed, 1 insertion(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 36a0505..19be587 100755 +index 36a0505b..19be587a 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -19,6 +19,7 @@ depends() { diff --git a/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch b/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch index f29f5ea..bbb3d30 100644 --- a/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch +++ b/SOURCES/0184-98systemd-also-install-systemd-journald-dev-log.sock.patch @@ -12,7 +12,7 @@ newly added socket unit. 1 file changed, 1 insertion(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 19be587..0de9d61 100755 +index 19be587a..0de9d614 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -103,6 +103,7 @@ install() { diff --git a/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch b/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch index e05a2d8..d3facb2 100644 --- a/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch +++ b/SOURCES/0185-lsinitrd.sh-don-t-choke-on-LZO-compressed-images.patch @@ -14,7 +14,7 @@ I guess no-one actually uses them. 1 file changed, 3 insertions(+) diff --git a/lsinitrd.sh b/lsinitrd.sh -index 7b12ab9..b36b34e 100755 +index 7b12ab96..b36b34e2 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -181,6 +181,9 @@ CAT=$({ diff --git a/SOURCES/0186-usable_root-only-check-for-ld-.so.patch b/SOURCES/0186-usable_root-only-check-for-ld-.so.patch index 94eafec..f3686fd 100644 --- a/SOURCES/0186-usable_root-only-check-for-ld-.so.patch +++ b/SOURCES/0186-usable_root-only-check-for-ld-.so.patch @@ -13,7 +13,7 @@ see, if we can find an elf loader 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 66977e7..417cfd8 100755 +index 66977e73..417cfd8e 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -730,11 +730,18 @@ $(readlink -e -q "$d")" || return 255 diff --git a/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch b/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch index 35a224e..aa117b6 100644 --- a/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch +++ b/SOURCES/0187-print-out-what-kernel-command-line-parameters-are-us.patch @@ -12,7 +12,7 @@ Conflicts: 1 file changed, 3 insertions(+) diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index 36406d9..8a5ab2f 100755 +index 36406d9d..8a5ab2ff 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -15,6 +15,9 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh diff --git a/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch b/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch index b8a55cb..be2f788 100644 --- a/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch +++ b/SOURCES/0188-kernel-modules-add-tegra-arm-modules.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kernel-modules: add tegra arm modules 1 file changed, 2 insertions(+) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 603a7a1..da3b1f3 100755 +index 603a7a19..da3b1f3f 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -51,6 +51,8 @@ installkernel() { diff --git a/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch b/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch index ff8dbf6..6beff5d 100644 --- a/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch +++ b/SOURCES/0189-Add-rd.cmdline-ask-kernel-command-line-parameter.patch @@ -22,7 +22,7 @@ Conflicts: create mode 100755 modules.d/98systemd/dracut-cmdline-ask.sh diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 10550ee..24bf449 100644 +index 10550eef..24bf4491 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -81,6 +81,10 @@ rootfstype=ext3 @@ -38,7 +38,7 @@ index 10550ee..24bf449 100644 _/etc/fstab_ of the real root. diff --git a/modules.d/98systemd/dracut-cmdline-ask.service b/modules.d/98systemd/dracut-cmdline-ask.service new file mode 100644 -index 0000000..9993671 +index 00000000..9993671c --- /dev/null +++ b/modules.d/98systemd/dracut-cmdline-ask.service @@ -0,0 +1,33 @@ @@ -77,7 +77,7 @@ index 0000000..9993671 +KillSignal=SIGHUP diff --git a/modules.d/98systemd/dracut-cmdline-ask.sh b/modules.d/98systemd/dracut-cmdline-ask.sh new file mode 100755 -index 0000000..024d60e +index 00000000..024d60ee --- /dev/null +++ b/modules.d/98systemd/dracut-cmdline-ask.sh @@ -0,0 +1,20 @@ @@ -102,7 +102,7 @@ index 0000000..024d60e + +exit 0 diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 0de9d61..015597f 100755 +index 0de9d614..015597f4 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -183,6 +183,7 @@ install() { @@ -122,7 +122,7 @@ index 0de9d61..015597f 100755 dracut-mount.service \ dracut-pre-mount.service \ diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index ae73fd2..9ee3e9d 100755 +index ae73fd2c..9ee3e9dc 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -115,6 +115,14 @@ fi diff --git a/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch b/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch index 4db6750..a88dbfb 100644 --- a/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch +++ b/SOURCES/0190-base-init.sh-use-loop-counter-with-unique-varname.patch @@ -11,7 +11,7 @@ $i can be polluted too easily 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index 9ee3e9d..dcc62d2 100755 +index 9ee3e9dc..dcc62d2a 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -231,7 +231,7 @@ source_hook pre-mount diff --git a/SOURCES/0191-ifcfg-depends-on-network.patch b/SOURCES/0191-ifcfg-depends-on-network.patch index 54ce6db..af02459 100644 --- a/SOURCES/0191-ifcfg-depends-on-network.patch +++ b/SOURCES/0191-ifcfg-depends-on-network.patch @@ -9,7 +9,7 @@ Subject: [PATCH] ifcfg: depends on network 1 file changed, 1 insertion(+) diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh -index ce53e5e..4299fea 100755 +index ce53e5ed..4299fea1 100755 --- a/modules.d/45ifcfg/module-setup.sh +++ b/modules.d/45ifcfg/module-setup.sh @@ -8,6 +8,7 @@ check() { diff --git a/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch b/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch index 3f65042..9a0c693 100644 --- a/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch +++ b/SOURCES/0192-test-add-udev-settle-after-sfdisk.patch @@ -18,7 +18,7 @@ Subject: [PATCH] test: add udev settle after sfdisk 10 files changed, 14 insertions(+), 4 deletions(-) diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-01-BASIC/create-root.sh -index 96e3c33..3a62afd 100755 +index 96e3c339..3a62afd1 100755 --- a/test/TEST-01-BASIC/create-root.sh +++ b/test/TEST-01-BASIC/create-root.sh @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda </dev/sda1 poweroff -f diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh -index 740704f..416c3c3 100755 +index 740704f6..416c3c3f 100755 --- a/test/TEST-17-LVM-THIN/create-root.sh +++ b/test/TEST-17-LVM-THIN/create-root.sh @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda </dev/null; then @@ -50,7 +50,7 @@ index 6c847ba..a6b2842 100755 info "livenet: no url handler for $liveurl" fi diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh -index 74e1d43..d69cb45 100755 +index 74e1d43b..d69cb455 100755 --- a/modules.d/90lvm/parse-lvm.sh +++ b/modules.d/90lvm/parse-lvm.sh @@ -13,7 +13,7 @@ if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \ @@ -63,7 +63,7 @@ index 74e1d43..d69cb45 100755 fi diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 54f4990..1de6fb7 100755 +index 54f49903..1de6fb75 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -156,7 +156,7 @@ handle_netroot() @@ -76,7 +76,7 @@ index 54f4990..1de6fb7 100755 # install mount script [ -z "$DRACUT_SYSTEMD" ] && \ diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh -index ddb3819..8bfbebc 100755 +index ddb38192..8bfbebcb 100755 --- a/modules.d/95nbd/nbdroot.sh +++ b/modules.d/95nbd/nbdroot.sh @@ -102,7 +102,7 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then @@ -89,7 +89,7 @@ index ddb3819..8bfbebc 100755 if [ -z "$DRACUT_SYSTEMD" ]; then printf '/bin/mount %s\n' \ diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh -index 49c44b6..fe5a7fa 100755 +index 49c44b6f..fe5a7fa4 100755 --- a/modules.d/95nbd/parse-nbdroot.sh +++ b/modules.d/95nbd/parse-nbdroot.sh @@ -61,6 +61,6 @@ rootok=1 diff --git a/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch b/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch index 63f0f89..4c9a668 100644 --- a/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch +++ b/SOURCES/0207-lsinird-Adding-option-m-mod-to-list-dracut-modules-i.patch @@ -51,7 +51,7 @@ Signed-off-by: Hari Bathini 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/lsinitrd.sh b/lsinitrd.sh -index b36b34e..b086a63 100755 +index b36b34e2..b086a635 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -27,6 +27,7 @@ usage() diff --git a/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch b/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch index a05044c..1c2b203 100644 --- a/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch +++ b/SOURCES/0208-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.sh: also mkdir /run/lock, which is copied to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 7997428..bcdc2d8 100755 +index 79974286..bcdc2d8a 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1129,7 +1129,7 @@ if [[ $kernel_only != yes ]]; then diff --git a/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch b/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch index 7f2dd30..19d100b 100644 --- a/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch +++ b/SOURCES/0209-dracut.sh-no-need-to-make-subdirs-in-run.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.sh: no need to make subdirs in run 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index bcdc2d8..7d5c9e0 100755 +index bcdc2d8a..7d5c9e07 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1129,7 +1129,7 @@ if [[ $kernel_only != yes ]]; then diff --git a/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch b/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch index 84e670a..d4b1e24 100644 --- a/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch +++ b/SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut-functions.sh: do not force require modules.builtin* 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 0002556..8a0cd30 100755 +index 00025567..8a0cd301 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1455,13 +1455,6 @@ dracut_kernel_post() { @@ -28,7 +28,7 @@ index 0002556..8a0cd30 100755 [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" done diff --git a/dracut.sh b/dracut.sh -index 7d5c9e0..f560dd1 100755 +index 7d5c9e07..f560dd1e 100755 --- a/dracut.sh +++ b/dracut.sh @@ -518,7 +518,7 @@ if [[ $regenerate_all == "yes" ]]; then diff --git a/SOURCES/0211-Make-logfile-configurable.patch b/SOURCES/0211-Make-logfile-configurable.patch index a9442af..616d52f 100644 --- a/SOURCES/0211-Make-logfile-configurable.patch +++ b/SOURCES/0211-Make-logfile-configurable.patch @@ -14,7 +14,7 @@ Signed-off-by: Hannes Reinecke 2 files changed, 10 insertions(+) diff --git a/dracut.8.asc b/dracut.8.asc -index f97074a..14ce26b 100644 +index f97074a2..14ce26b6 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -275,6 +275,12 @@ Default: @@ -31,7 +31,7 @@ index f97074a..14ce26b 100644 activates the local mode. dracut will use modules from the current working directory instead of the system-wide installed modules in diff --git a/dracut.sh b/dracut.sh -index f560dd1..8e5e86f 100755 +index f560dd1e..8e5e86f7 100755 --- a/dracut.sh +++ b/dracut.sh @@ -187,6 +187,7 @@ Creates initial ramdisk images for preloading modules diff --git a/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch b/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch index 302cab2..b421a8c 100644 --- a/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch +++ b/SOURCES/0212-Dracut-Add-a-new-argument-rebuild.patch @@ -36,7 +36,7 @@ Simplified the cpio extraction process by using 'lsinitrd'. 1 file changed, 210 insertions(+), 132 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 8e5e86f..eff096e 100755 +index 8e5e86f7..eff096e5 100755 --- a/dracut.sh +++ b/dracut.sh @@ -70,6 +70,7 @@ Creates initial ramdisk images for preloading modules diff --git 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 index 79d6505..7acd087 100644 --- 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 @@ -12,7 +12,7 @@ cherry-picked from 29763cb72d17fe8d22766170ec06b32419829243 1 file changed, 50 insertions(+), 62 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index c8f9204..e2901da 100755 +index c8f92048..e2901dad 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -271,66 +271,46 @@ parse_iscsi_root() diff --git a/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch b/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch index fe61c3b..8722604 100644 --- a/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch +++ b/SOURCES/0214-replaced-ip-auto-with-ip-dhcp-in-the-documentation.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1086931 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut.usage.asc b/dracut.usage.asc -index 0b874e6..bee9e2e 100644 +index 0b874e60..bee9e2e1 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -209,7 +209,7 @@ be specified once. diff --git a/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch b/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch index b8e5b03..99b27e8 100644 --- a/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch +++ b/SOURCES/0215-Support-spaces-in-mount_nfs-1109933.patch @@ -13,7 +13,7 @@ Related: rhbz#1109933 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh -index 9ced2e6..bf7d044 100755 +index 9ced2e69..bf7d044b 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -125,7 +125,7 @@ munge_nfs_options() { diff --git a/SOURCES/0216-fixed-bridge-setup.patch b/SOURCES/0216-fixed-bridge-setup.patch index cab09fa..cfa055f 100644 --- a/SOURCES/0216-fixed-bridge-setup.patch +++ b/SOURCES/0216-fixed-bridge-setup.patch @@ -16,7 +16,7 @@ fixed ifcfg generation 4 files changed, 22 insertions(+), 44 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 79127f2..43e84a2 100755 +index 79127f24..43e84a2c 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -60,7 +60,7 @@ fi @@ -38,7 +38,7 @@ index 79127f2..43e84a2 100755 DO_BOND_SETUP=yes ifup $bondname -m elif [ "$ethname" = "$teammaster" ] ; then diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index af2f09c..a43e3df 100755 +index af2f09c1..a43e3df1 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh @@ -51,7 +51,7 @@ index af2f09c..a43e3df 100755 fi diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh -index 8c305c0..a910109 100755 +index 8c305c0f..a9101094 100755 --- a/modules.d/40network/parse-bridge.sh +++ b/modules.d/40network/parse-bridge.sh @@ -3,9 +3,9 @@ @@ -105,7 +105,7 @@ index 8c305c0..a910109 100755 return fi diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 5e333e4..c1cd23c 100755 +index 5e333e45..c1cd23c3 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -214,6 +214,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch b/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch index 08ff4b8..12df46c 100644 --- a/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch +++ b/SOURCES/0217-bridging-update-the-ifcfg-files-generated-for-bridge.patch @@ -15,7 +15,7 @@ Bug #1123552 https://bugzilla.redhat.com/show_bug.cgi?id=1123552 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index c1cd23c..48e75a6 100755 +index c1cd23c3..48e75a63 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -234,8 +234,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git 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 index 4d4e268..1861ef8 100644 --- 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 @@ -14,7 +14,7 @@ Previously, this was bound unconditionally with HWADDR. 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 48e75a6..aed3069 100755 +index 48e75a63..aed30698 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -82,6 +82,20 @@ print_s390() { diff --git a/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch b/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch index 1f3475b..1074295 100644 --- a/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch +++ b/SOURCES/0219-cms-cmssetup.sh-fixed-indention.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cms/cmssetup.sh: fixed indention 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh -index c9e1331..7dd481b 100755 +index c9e13314..7dd481b5 100755 --- a/modules.d/80cms/cmssetup.sh +++ b/modules.d/80cms/cmssetup.sh @@ -44,147 +44,147 @@ function dasd_settle() { diff --git a/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch b/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch index 4135eed..0fba9f9 100644 --- a/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch +++ b/SOURCES/0220-cms-cmssetup.sh-understand-DASD-none.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1096979 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh -index 7dd481b..6259ff4 100755 +index 7dd481b5..6259ff41 100755 --- a/modules.d/80cms/cmssetup.sh +++ b/modules.d/80cms/cmssetup.sh @@ -175,7 +175,7 @@ processcmsfile() diff --git a/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch b/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch index e749b9c..a356241 100644 --- a/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch +++ b/SOURCES/0221-qemu-install-virtio_console-kernel-module.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1097999 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh -index 0dbf081..6779642 100755 +index 0dbf0818..67796429 100755 --- a/modules.d/90qemu/module-setup.sh +++ b/modules.d/90qemu/module-setup.sh @@ -22,5 +22,8 @@ check() { diff --git a/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch b/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch index 49f0962..0795823 100644 --- a/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch +++ b/SOURCES/0222-dracut-functions.sh-exit-for-missing-force-add-or-ad.patch @@ -12,7 +12,7 @@ Better exit with fail early, so there is no surprise on reboot. 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 8a0cd30..6e0b44a 100755 +index 8a0cd301..6e0b44ae 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1314,11 +1314,17 @@ for_each_module_dir() { diff --git a/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch b/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch index 4cb8c64..d05e9fd 100644 --- a/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch +++ b/SOURCES/0223-do-ip-route-replace-default-instead-of-add.patch @@ -20,7 +20,7 @@ correctly change the default route to the new interface. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index ba05250..885303a 100755 +index ba05250d..885303a2 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -45,7 +45,7 @@ setup_interface() { @@ -33,7 +33,7 @@ index ba05250..885303a 100755 [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf if [ -n "$namesrv" ] ; then diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 43e84a2..67b1d9f 100755 +index 43e84a2c..67b1d9f8 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -145,7 +145,7 @@ do_static() { diff --git a/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch b/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch index 873c41b..ccb0759 100644 --- a/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch +++ b/SOURCES/0224-network-net-lib.sh-is_persistent_ethernet_name-eth-i.patch @@ -11,7 +11,7 @@ eth* is _not_ a persistent ethernet name... tsk, tsk, tsk 1 file changed, 2 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index e2901da..22f7754 100755 +index e2901dad..22f77546 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -555,8 +555,6 @@ find_iface_with_link() { diff --git 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 index 6a78d93..26e4668 100644 --- 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 @@ -13,7 +13,7 @@ DEVICE="", if HWADDR is given. 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 22f7754..337817e 100755 +index 22f77546..337817e3 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -553,7 +553,19 @@ find_iface_with_link() { @@ -74,7 +74,7 @@ index 22f7754..337817e 100755 + +} diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index aed3069..a1bae72 100755 +index aed30698..a1bae72f 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -82,18 +82,41 @@ print_s390() { diff --git a/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch b/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch index 1939747..737996b 100644 --- a/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch +++ b/SOURCES/0226-fips-add-libfreeblpriv3.so-and-libfreeblpriv3.chk.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fips: add libfreeblpriv3.so and libfreeblpriv3.chk 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 35cfdc5..2b0e836 100755 +index 35cfdc5a..2b0e836c 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -38,7 +38,8 @@ install() { diff --git a/SOURCES/0227-fips-remove-c-p-and.patch b/SOURCES/0227-fips-remove-c-p-and.patch index 865c19f..a6d11ba 100644 --- a/SOURCES/0227-fips-remove-c-p-and.patch +++ b/SOURCES/0227-fips-remove-c-p-and.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fips: remove c&p "and" 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 2b0e836..906b49f 100755 +index 2b0e836c..906b49f4 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -39,7 +39,7 @@ install() { diff --git 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 index 2e7a081..688cfa1 100644 --- 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 @@ -18,7 +18,7 @@ the fallback parser by checking the LUN for a numerical value. 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 337817e..f085020 100755 +index 337817e3..f0850207 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -310,6 +310,23 @@ parse_iscsi_root() diff --git a/SOURCES/0229-ssh-client-s-key-key.patch b/SOURCES/0229-ssh-client-s-key-key.patch index f36c98d..ebd0cb4 100644 --- a/SOURCES/0229-ssh-client-s-key-key.patch +++ b/SOURCES/0229-ssh-client-s-key-key.patch @@ -13,7 +13,7 @@ Thanks Jan Stodola! 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh -index f60e963..c7d8ee2 100755 +index f60e9631..c7d8ee24 100755 --- a/modules.d/95ssh-client/module-setup.sh +++ b/modules.d/95ssh-client/module-setup.sh @@ -45,7 +45,7 @@ inst_sshenv() diff --git a/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch b/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch index 75cdc6e..d51be26 100644 --- a/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch +++ b/SOURCES/0230-cms-cms-write-ifcfg.sh-turn-SUBCHANNELS-into-lowerca.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cms/cms-write-ifcfg.sh: turn SUBCHANNELS into lowercase 1 file changed, 1 insertion(+) diff --git a/modules.d/80cms/cms-write-ifcfg.sh b/modules.d/80cms/cms-write-ifcfg.sh -index c0623a4..7846996 100755 +index c0623a41..78469960 100755 --- a/modules.d/80cms/cms-write-ifcfg.sh +++ b/modules.d/80cms/cms-write-ifcfg.sh @@ -9,6 +9,7 @@ mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts diff --git a/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch b/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch index d88273e..df32b8a 100644 --- a/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch +++ b/SOURCES/0231-40network-Fix-the-syntax-to-correct-the-judgment-sen.patch @@ -15,7 +15,7 @@ Signed-off-by: Minfei Huang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index f085020..9c6b9da 100755 +index f0850207..9c6b9dae 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -107,7 +107,7 @@ setup_net() { diff --git a/SOURCES/0232-systemd-add-90-vconsole.rules.patch b/SOURCES/0232-systemd-add-90-vconsole.rules.patch index e12008d..d270672 100644 --- a/SOURCES/0232-systemd-add-90-vconsole.rules.patch +++ b/SOURCES/0232-systemd-add-90-vconsole.rules.patch @@ -11,7 +11,7 @@ run systemd-vconsole-setup if fbcon device shows up 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 015597f..f62f551 100755 +index 015597f4..f62f5511 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -196,7 +196,12 @@ install() { diff --git a/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch b/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch index d88b133..4018b73 100644 --- a/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch +++ b/SOURCES/0233-network-add-support-for-comma-separated-autoconf-opt.patch @@ -12,7 +12,7 @@ might work now 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 67b1d9f..8749c4c 100755 +index 67b1d9f8..8749c4c2 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -326,17 +326,19 @@ for p in $(getargs ip=); do @@ -47,7 +47,7 @@ index 67b1d9f..8749c4c 100755 > /tmp/net.${netif}.up diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index b029d00..5b96e06 100755 +index b029d007..5b96e069 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -66,24 +66,26 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch b/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch index cc7cc2c..00e610a 100644 --- a/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch +++ b/SOURCES/0234-test-add-fs-lib-to-dracut-module-list.patch @@ -22,7 +22,7 @@ Subject: [PATCH] test: add "fs-lib" to dracut module list 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh -index 5ee6d23..02ebc23 100755 +index 5ee6d234..02ebc231 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -62,7 +62,7 @@ test_setup() { @@ -35,7 +35,7 @@ index 5ee6d23..02ebc23 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh -index 2ccf8e6..2a8ed6b 100755 +index 2ccf8e69..2a8ed6b5 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -58,7 +58,7 @@ test_setup() { @@ -48,7 +48,7 @@ index 2ccf8e6..2a8ed6b 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh -index ef74d40..b8231fe 100755 +index ef74d402..b8231fed 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -89,7 +89,7 @@ test_setup() { @@ -61,7 +61,7 @@ index ef74d40..b8231fe 100755 --nomdadmconf \ --nohardlink \ diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh -index 3eeb840..aa83122 100755 +index 3eeb8406..aa83122c 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -232,7 +232,7 @@ EOF @@ -74,7 +74,7 @@ index 3eeb840..aa83122 100755 --nomdadmconf \ --nohardlink \ diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh -index b17e912..d79d5cd 100755 +index b17e912c..d79d5cd4 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -5,7 +5,7 @@ KVERSION=${KVERSION-$(uname -r)} @@ -96,7 +96,7 @@ index b17e912..d79d5cd 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh -index 6f2461c..732d0c8 100755 +index 6f2461c9..732d0c8f 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -57,7 +57,7 @@ test_setup() { @@ -109,7 +109,7 @@ index 6f2461c..732d0c8 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh -index 2631621..87fe542 100755 +index 26316210..87fe542f 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -98,7 +98,7 @@ test_setup() { @@ -122,7 +122,7 @@ index 2631621..87fe542 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh -index 5102142..129620b 100755 +index 51021420..129620b1 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -94,7 +94,7 @@ test_setup() { @@ -135,7 +135,7 @@ index 5102142..129620b 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh -index 532c348..ad0cf7b 100755 +index 532c3489..ad0cf7b0 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -86,7 +86,7 @@ test_setup() { @@ -148,7 +148,7 @@ index 532c348..ad0cf7b 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh -index 3fc1d45..71f5703 100755 +index 3fc1d459..71f5703a 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -58,7 +58,7 @@ test_setup() { @@ -161,7 +161,7 @@ index 3fc1d45..71f5703 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh -index 0cfce19..4c904b0 100755 +index 0cfce199..4c904b0a 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -57,7 +57,7 @@ test_setup() { @@ -174,7 +174,7 @@ index 0cfce19..4c904b0 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh -index 4f21d45..7b5e3c5 100755 +index 4f21d451..7b5e3c5d 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -340,7 +340,7 @@ test_setup() { @@ -187,7 +187,7 @@ index 4f21d45..7b5e3c5 100755 -f $TESTDIR/initramfs.server $KVERSION || return 1 diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh -index 7cf64b1..59494ed 100755 +index 7cf64b15..59494ed8 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -226,7 +226,7 @@ make_encrypted_root() { @@ -209,7 +209,7 @@ index 7cf64b1..59494ed 100755 -f $TESTDIR/initramfs.server $KVERSION || return 1 diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index add849c..3c6003b 100755 +index add849c1..3c6003b4 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -264,7 +264,7 @@ test_setup() { diff --git a/SOURCES/0235-network-enhance-team-support.patch b/SOURCES/0235-network-enhance-team-support.patch index 6512b59..daa814a 100644 --- a/SOURCES/0235-network-enhance-team-support.patch +++ b/SOURCES/0235-network-enhance-team-support.patch @@ -20,7 +20,7 @@ initramfs. 6 files changed, 119 insertions(+), 23 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 8749c4c..7836a6b 100755 +index 8749c4c2..7836a6b3 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -34,14 +34,16 @@ for i in /tmp/bond.*.info; do @@ -95,7 +95,7 @@ index 8749c4c..7836a6b 100755 fi diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index a5e796f..a52e881 100755 +index a5e796f4..a52e881b 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -95,6 +95,43 @@ install() { @@ -143,7 +143,7 @@ index a5e796f..a52e881 100755 inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \ diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index a43e3df..3664984 100755 +index a43e3df1..3664984f 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -31,11 +31,14 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh @@ -165,7 +165,7 @@ index a43e3df..3664984 100755 if [ -e /tmp/vlan.info ]; then . /tmp/vlan.info diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 9c6b9da..82827b6 100755 +index 9c6b9dae..82827b6d 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -643,3 +643,21 @@ is_kernel_ethernet_name() { @@ -191,7 +191,7 @@ index 9c6b9da..82827b6 100755 + printf -- "%s" ${_subchannels%,} +} diff --git a/modules.d/40network/parse-team.sh b/modules.d/40network/parse-team.sh -index 318c0e1..a836d68 100755 +index 318c0e1e..a836d688 100755 --- a/modules.d/40network/parse-team.sh +++ b/modules.d/40network/parse-team.sh @@ -24,21 +24,31 @@ parseteam() { @@ -237,7 +237,7 @@ index 318c0e1..a836d68 100755 + done fi diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index a1bae72..b2462da 100755 +index a1bae72f..b2462dae 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -128,6 +128,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0236-dracut-fixed-module-dependency-handling.patch b/SOURCES/0236-dracut-fixed-module-dependency-handling.patch index feda7d2..490a7cb 100644 --- a/SOURCES/0236-dracut-fixed-module-dependency-handling.patch +++ b/SOURCES/0236-dracut-fixed-module-dependency-handling.patch @@ -13,7 +13,7 @@ dependencies cannot be included. 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 6e0b44a..89438b2 100755 +index 6e0b44ae..89438b29 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1215,13 +1215,17 @@ check_mount() { @@ -96,7 +96,7 @@ index 6e0b44a..89438b2 100755 done } diff --git a/dracut.sh b/dracut.sh -index eff096e..74c59a0 100755 +index eff096e5..74c59a0c 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1152,7 +1152,9 @@ fi diff --git a/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch b/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch index ec2af4a..c5fb151 100644 --- a/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch +++ b/SOURCES/0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch @@ -11,7 +11,7 @@ fix iscsi_target_name for eui.* and naa.* target names 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 82827b6..89b1101 100755 +index 82827b6d..89b1101d 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -318,12 +318,12 @@ parse_iscsi_root() diff --git a/SOURCES/0238-network-ifup-source-team-info-if-present.patch b/SOURCES/0238-network-ifup-source-team-info-if-present.patch index 2cc22a3..a677f7c 100644 --- a/SOURCES/0238-network-ifup-source-team-info-if-present.patch +++ b/SOURCES/0238-network-ifup-source-team-info-if-present.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network:ifup source team info if present 1 file changed, 1 insertion(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 7836a6b..524a3fb 100755 +index 7836a6b3..524a3fb5 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -38,6 +38,7 @@ for i in /tmp/team.*.info; do diff --git a/SOURCES/0239-fips-add-drbg-kernel-module.patch b/SOURCES/0239-fips-add-drbg-kernel-module.patch index 3709505..b3754bc 100644 --- a/SOURCES/0239-fips-add-drbg-kernel-module.patch +++ b/SOURCES/0239-fips-add-drbg-kernel-module.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fips: add drbg kernel module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 906b49f..48156e7 100755 +index 906b49f4..48156e7e 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -13,7 +13,7 @@ depends() { diff --git a/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch b/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch index 0518ab0..c7ca75e 100644 --- a/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch +++ b/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch @@ -12,7 +12,7 @@ interface, if teamd is not started with "-N". 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 524a3fb..bd7db02 100755 +index 524a3fb5..bd7db02c 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -223,7 +223,7 @@ if [ -e /tmp/team.${netif}.info ]; then diff --git a/SOURCES/0241-do-not-symlink-var-log-to-run-log.patch b/SOURCES/0241-do-not-symlink-var-log-to-run-log.patch index 0a00e8b..830def8 100644 --- a/SOURCES/0241-do-not-symlink-var-log-to-run-log.patch +++ b/SOURCES/0241-do-not-symlink-var-log-to-run-log.patch @@ -19,7 +19,7 @@ the marker to do some actions. Here journald tries to flush create mode 100644 modules.d/98systemd/dracut-tmpfiles.conf diff --git a/dracut.sh b/dracut.sh -index 74c59a0..27c2bf4 100755 +index 74c59a0c..27c2bf45 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1217,7 +1217,6 @@ if [[ $kernel_only != yes ]]; then @@ -32,7 +32,7 @@ index 74c59a0..27c2bf4 100755 [[ -e "${initdir}${prefix}/$d" ]] && continue diff --git a/modules.d/98systemd/dracut-tmpfiles.conf b/modules.d/98systemd/dracut-tmpfiles.conf new file mode 100644 -index 0000000..3c21ce8 +index 00000000..3c21ce81 --- /dev/null +++ b/modules.d/98systemd/dracut-tmpfiles.conf @@ -0,0 +1,3 @@ @@ -40,7 +40,7 @@ index 0000000..3c21ce8 +d /run/initramfs/log 0755 root root - +L /var/log - - - - ../run/initramfs/log diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index f62f551..aae0319 100755 +index f62f5511..aae0319a 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -121,6 +121,8 @@ install() { @@ -63,7 +63,7 @@ index f62f551..aae0319 100755 # turn off RateLimit for journal { diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index b0ac08a..b490e82 100755 +index b0ac08a0..b490e824 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -4,6 +4,17 @@ diff --git a/SOURCES/0242-dracut.sh-add-tmpfilesdir-to-install-files-to-usr-li.patch b/SOURCES/0242-dracut.sh-add-tmpfilesdir-to-install-files-to-usr-li.patch index 201ab36..6a6c367 100644 --- a/SOURCES/0242-dracut.sh-add-tmpfilesdir-to-install-files-to-usr-li.patch +++ b/SOURCES/0242-dracut.sh-add-tmpfilesdir-to-install-files-to-usr-li.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut.sh: add $tmpfilesdir to install files to 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 27c2bf4..6e56af5 100755 +index 27c2bf45..6e56af50 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1152,6 +1152,14 @@ fi diff --git a/SOURCES/0243-fips-add-some-s390-kernel-modules.patch b/SOURCES/0243-fips-add-some-s390-kernel-modules.patch index 313dba1..86be5ac 100644 --- a/SOURCES/0243-fips-add-some-s390-kernel-modules.patch +++ b/SOURCES/0243-fips-add-some-s390-kernel-modules.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fips: add some s390 kernel modules 1 file changed, 1 insertion(+) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 48156e7..dd8e47d 100755 +index 48156e7e..dd8e47d1 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -17,6 +17,7 @@ installkernel() { diff --git a/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch b/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch index 03a243d..901f034 100644 --- a/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch +++ b/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch @@ -10,7 +10,7 @@ Subject: [PATCH] rearrange fips module ordering due to zlib 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index dd8e47d..77ed24e 100755 +index dd8e47d1..77ed24ef 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -16,8 +16,8 @@ installkernel() { diff --git a/SOURCES/0245-network-dhcp-wait_for_ipv6_dad-in-PREINIT6.patch b/SOURCES/0245-network-dhcp-wait_for_ipv6_dad-in-PREINIT6.patch index 99d062c..23250fa 100644 --- a/SOURCES/0245-network-dhcp-wait_for_ipv6_dad-in-PREINIT6.patch +++ b/SOURCES/0245-network-dhcp-wait_for_ipv6_dad-in-PREINIT6.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network:dhcp:wait_for_ipv6_dad() in PREINIT6 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 885303a..aef94d6 100755 +index 885303a2..aef94d6c 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -95,8 +95,9 @@ case $reason in @@ -24,7 +24,7 @@ index 885303a..aef94d6 100755 BOUND) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 89b1101..220480b 100755 +index 89b1101d..220480b2 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -522,7 +522,7 @@ wait_for_ipv6_dad() { diff --git a/SOURCES/0246-network-net-lib.sh-iface_has_link-wait-5s-for-the-ca.patch b/SOURCES/0246-network-net-lib.sh-iface_has_link-wait-5s-for-the-ca.patch index 59aec8b..6965e70 100644 --- a/SOURCES/0246-network-net-lib.sh-iface_has_link-wait-5s-for-the-ca.patch +++ b/SOURCES/0246-network-net-lib.sh-iface_has_link-wait-5s-for-the-ca.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1088808 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 220480b..1f77a15 100755 +index 220480b2..1f77a154 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -556,13 +556,18 @@ hostname() { diff --git a/SOURCES/0247-dracut-pre-pivot-call-udevadm-settle-one-last-time.patch b/SOURCES/0247-dracut-pre-pivot-call-udevadm-settle-one-last-time.patch index 52e6115..d0c4441 100644 --- a/SOURCES/0247-dracut-pre-pivot-call-udevadm-settle-one-last-time.patch +++ b/SOURCES/0247-dracut-pre-pivot-call-udevadm-settle-one-last-time.patch @@ -11,7 +11,7 @@ scripts would harm the process. 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service -index d7c7b1d..f453900 100644 +index d7c7b1d7..f4539006 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -16,13 +16,6 @@ Before=initrd-cleanup.service @@ -29,7 +29,7 @@ index d7c7b1d..f453900 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh -index e62a1ce..afe3466 100755 +index e62a1cec..afe34668 100755 --- a/modules.d/98systemd/dracut-pre-pivot.sh +++ b/modules.d/98systemd/dracut-pre-pivot.sh @@ -26,4 +26,16 @@ getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switc diff --git a/SOURCES/0248-dracut.sh-add-devices-with-x-initrd.mount-in-etc-fst.patch b/SOURCES/0248-dracut.sh-add-devices-with-x-initrd.mount-in-etc-fst.patch index 66dca53..0838f2a 100644 --- a/SOURCES/0248-dracut.sh-add-devices-with-x-initrd.mount-in-etc-fst.patch +++ b/SOURCES/0248-dracut.sh-add-devices-with-x-initrd.mount-in-etc-fst.patch @@ -12,7 +12,7 @@ otherwise dracut might not even be able to mount those. 1 file changed, 14 insertions(+) diff --git a/dracut.sh b/dracut.sh -index 6e56af5..0e60022 100755 +index 6e56af50..0e600220 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1061,6 +1061,20 @@ if [[ $hostonly ]]; then diff --git a/SOURCES/0249-crypt-add-drbg-kernel-module.patch b/SOURCES/0249-crypt-add-drbg-kernel-module.patch index c80bd09..582d78d 100644 --- a/SOURCES/0249-crypt-add-drbg-kernel-module.patch +++ b/SOURCES/0249-crypt-add-drbg-kernel-module.patch @@ -8,7 +8,7 @@ Subject: [PATCH] crypt: add drbg kernel module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index 267d39d..272e527 100755 +index 267d39d5..272e527d 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -23,7 +23,7 @@ depends() { diff --git a/SOURCES/0250-dracut-lib.sh-info-output-info-to-stderr.patch b/SOURCES/0250-dracut-lib.sh-info-output-info-to-stderr.patch index 1d0e192..1d25a20 100644 --- a/SOURCES/0250-dracut-lib.sh-info-output-info-to-stderr.patch +++ b/SOURCES/0250-dracut-lib.sh-info-output-info-to-stderr.patch @@ -11,7 +11,7 @@ otherwise it might collide with stdout redirection 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index b490e82..69f7079 100755 +index b490e824..69f70799 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -51,7 +51,7 @@ if [ -z "$DRACUT_SYSTEMD" ]; then diff --git a/SOURCES/0251-Factor-out-all-the-type-V-commands.patch b/SOURCES/0251-Factor-out-all-the-type-V-commands.patch index 4928403..701c722 100644 --- a/SOURCES/0251-Factor-out-all-the-type-V-commands.patch +++ b/SOURCES/0251-Factor-out-all-the-type-V-commands.patch @@ -55,7 +55,7 @@ module is not included in the initramfs. 37 files changed, 112 insertions(+), 66 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 89438b2..4ea3204 100755 +index 89438b29..4ea3204d 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -35,6 +35,51 @@ fi @@ -165,7 +165,7 @@ index 89438b2..4ea3204 100755 unset check depends cmdline install installkernel return $_ret diff --git a/modules.d/00bash/module-setup.sh b/modules.d/00bash/module-setup.sh -index e874e73..109642a 100755 +index e874e73d..109642ac 100755 --- a/modules.d/00bash/module-setup.sh +++ b/modules.d/00bash/module-setup.sh @@ -3,7 +3,7 @@ @@ -178,7 +178,7 @@ index e874e73..109642a 100755 depends() { diff --git a/modules.d/00bootchart/module-setup.sh b/modules.d/00bootchart/module-setup.sh -index 72b6063..f03fc54 100755 +index 72b60633..f03fc540 100755 --- a/modules.d/00bootchart/module-setup.sh +++ b/modules.d/00bootchart/module-setup.sh @@ -4,7 +4,7 @@ @@ -191,7 +191,7 @@ index 72b6063..f03fc54 100755 } diff --git a/modules.d/00dash/module-setup.sh b/modules.d/00dash/module-setup.sh -index dfd4d7b..9a2a92f 100755 +index dfd4d7bf..9a2a92fc 100755 --- a/modules.d/00dash/module-setup.sh +++ b/modules.d/00dash/module-setup.sh @@ -3,7 +3,7 @@ @@ -204,7 +204,7 @@ index dfd4d7b..9a2a92f 100755 depends() { diff --git a/modules.d/00systemd-bootchart/module-setup.sh b/modules.d/00systemd-bootchart/module-setup.sh -index 3eb4de1..eb6f383 100755 +index 3eb4de1e..eb6f383c 100755 --- a/modules.d/00systemd-bootchart/module-setup.sh +++ b/modules.d/00systemd-bootchart/module-setup.sh @@ -4,7 +4,7 @@ @@ -217,7 +217,7 @@ index 3eb4de1..eb6f383 100755 } diff --git a/modules.d/02caps/module-setup.sh b/modules.d/02caps/module-setup.sh -index c9d94ee..73eb215 100755 +index c9d94eeb..73eb215b 100755 --- a/modules.d/02caps/module-setup.sh +++ b/modules.d/02caps/module-setup.sh @@ -3,7 +3,7 @@ @@ -248,7 +248,7 @@ index c9d94ee..73eb215 100755 } diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh -index 730cd86..bed5cfe 100755 +index 730cd86e..bed5cfe1 100755 --- a/modules.d/03modsign/module-setup.sh +++ b/modules.d/03modsign/module-setup.sh @@ -8,7 +8,7 @@ @@ -261,7 +261,7 @@ index 730cd86..bed5cfe 100755 # do not include module in hostonly mode, # if no keys are present diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh -index edcc8da..c35ab2e 100755 +index edcc8daa..c35ab2e9 100755 --- a/modules.d/05busybox/module-setup.sh +++ b/modules.d/05busybox/module-setup.sh @@ -3,7 +3,7 @@ @@ -274,7 +274,7 @@ index edcc8da..c35ab2e 100755 return 255 } diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 413ee12..2c0a275 100755 +index 413ee123..2c0a275c 100755 --- a/modules.d/10i18n/module-setup.sh +++ b/modules.d/10i18n/module-setup.sh @@ -5,9 +5,7 @@ @@ -289,7 +289,7 @@ index 413ee12..2c0a275 100755 return 0 } diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index a52e881..3134b5f 100755 +index a52e881b..3134b5ff 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -5,12 +5,7 @@ @@ -307,7 +307,7 @@ index a52e881..3134b5f 100755 return 255 } diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh -index b5cf36f..f2d068b 100755 +index b5cf36f2..f2d068b3 100755 --- a/modules.d/45url-lib/module-setup.sh +++ b/modules.d/45url-lib/module-setup.sh @@ -2,7 +2,7 @@ @@ -320,7 +320,7 @@ index b5cf36f..f2d068b 100755 } diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh -index e0e6936..961c1e3 100755 +index e0e69367..961c1e39 100755 --- a/modules.d/50plymouth/module-setup.sh +++ b/modules.d/50plymouth/module-setup.sh @@ -4,7 +4,7 @@ @@ -333,7 +333,7 @@ index e0e6936..961c1e3 100755 depends() { diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh -index a280594..4804f58 100755 +index a2805946..4804f58b 100755 --- a/modules.d/90btrfs/module-setup.sh +++ b/modules.d/90btrfs/module-setup.sh @@ -6,7 +6,7 @@ check() { @@ -346,7 +346,7 @@ index a280594..4804f58 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for fs in ${host_fs_types[@]}; do diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index 272e527..dbc87a4 100755 +index 272e527d..dbc87a43 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -5,7 +5,7 @@ @@ -359,7 +359,7 @@ index 272e527..dbc87a4 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for fs in "${host_fs_types[@]}"; do diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh -index 1fd9298..ed94f43 100755 +index 1fd92987..ed94f436 100755 --- a/modules.d/90dm/module-setup.sh +++ b/modules.d/90dm/module-setup.sh @@ -3,7 +3,7 @@ @@ -372,7 +372,7 @@ index 1fd9298..ed94f43 100755 } diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh -index b230cb0..8ca69aa 100755 +index b230cb0e..8ca69aa8 100755 --- a/modules.d/90dmraid/module-setup.sh +++ b/modules.d/90dmraid/module-setup.sh @@ -6,7 +6,7 @@ check() { @@ -385,7 +385,7 @@ index b230cb0..8ca69aa 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for dev in "${!host_fs_types[@]}"; do diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 0c5890a..5ec6281 100755 +index 0c5890a7..5ec62812 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -4,7 +4,7 @@ @@ -398,7 +398,7 @@ index 0c5890a..5ec6281 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for fs in "${host_fs_types[@]}"; do diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh -index 815a3eb..2092dae 100755 +index 815a3ebc..2092daea 100755 --- a/modules.d/90mdraid/module-setup.sh +++ b/modules.d/90mdraid/module-setup.sh @@ -5,7 +5,7 @@ @@ -411,7 +411,7 @@ index 815a3eb..2092dae 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for dev in "${!host_fs_types[@]}"; do diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index feb58dc..d37f958 100755 +index feb58dcd..d37f9587 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -5,7 +5,7 @@ @@ -424,7 +424,7 @@ index feb58dc..d37f958 100755 is_mpath() { local _dev=$1 diff --git a/modules.d/91crypt-gpg/module-setup.sh b/modules.d/91crypt-gpg/module-setup.sh -index 43a5a00..17b58f1 100755 +index 43a5a000..17b58f1a 100755 --- a/modules.d/91crypt-gpg/module-setup.sh +++ b/modules.d/91crypt-gpg/module-setup.sh @@ -4,7 +4,7 @@ @@ -437,7 +437,7 @@ index 43a5a00..17b58f1 100755 return 255 } diff --git a/modules.d/91crypt-loop/module-setup.sh b/modules.d/91crypt-loop/module-setup.sh -index c14fd45..d0a4956 100644 +index c14fd45a..d0a49567 100644 --- a/modules.d/91crypt-loop/module-setup.sh +++ b/modules.d/91crypt-loop/module-setup.sh @@ -1,19 +1,24 @@ @@ -474,7 +474,7 @@ index c14fd45..d0a4956 100644 + dracut_need_initqueue } diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh -index c17b973..9e36f87 100755 +index c17b973a..9e36f87f 100755 --- a/modules.d/95cifs/module-setup.sh +++ b/modules.d/95cifs/module-setup.sh @@ -4,7 +4,7 @@ @@ -487,7 +487,7 @@ index c17b973..9e36f87 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for fs in ${host_fs_types[@]}; do diff --git a/modules.d/95dasd/module-setup.sh b/modules.d/95dasd/module-setup.sh -index 3b8396d..70b2fcc 100755 +index 3b8396db..70b2fcc8 100755 --- a/modules.d/95dasd/module-setup.sh +++ b/modules.d/95dasd/module-setup.sh @@ -5,6 +5,7 @@ @@ -499,7 +499,7 @@ index 3b8396d..70b2fcc 100755 } diff --git a/modules.d/95dasd_mod/module-setup.sh b/modules.d/95dasd_mod/module-setup.sh -index 9c9eeea..d20764e 100755 +index 9c9eeead..d20764eb 100755 --- a/modules.d/95dasd_mod/module-setup.sh +++ b/modules.d/95dasd_mod/module-setup.sh @@ -5,6 +5,7 @@ @@ -511,7 +511,7 @@ index 9c9eeea..d20764e 100755 return 0 } diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index c91f775..0fb06e2 100755 +index c91f7754..0fb06e23 100755 --- a/modules.d/95fcoe-uefi/module-setup.sh +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -4,9 +4,7 @@ @@ -526,7 +526,7 @@ index c91f775..0fb06e2 100755 } diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 3ffaf5a..8c6290d 100755 +index 3ffaf5a5..8c6290d4 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -3,10 +3,7 @@ @@ -542,7 +542,7 @@ index 3ffaf5a..8c6290d 100755 } diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index c6901c0..49f9a0e 100755 +index c6901c08..49f9a0ed 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -5,7 +5,7 @@ @@ -555,7 +555,7 @@ index c6901c0..49f9a0e 100755 # If hostonly was requested, fail the check if we are not actually # booting from root. diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh -index 3ac00f6..7e8a416 100755 +index 3ac00f60..7e8a416c 100755 --- a/modules.d/95nbd/module-setup.sh +++ b/modules.d/95nbd/module-setup.sh @@ -5,7 +5,7 @@ @@ -568,7 +568,7 @@ index 3ac00f6..7e8a416 100755 # if an nbd device is not somewhere in the chain of devices root is # mounted on, fail the hostonly check. diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index 75beb74..02838a4 100755 +index 75beb746..02838a49 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -4,8 +4,8 @@ @@ -583,7 +583,7 @@ index 75beb74..02838a4 100755 [[ $hostonly ]] || [[ $mount_needs ]] && { for fs in ${host_fs_types[@]}; do diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh -index c7d8ee2..6b44107 100755 +index c7d8ee24..6b441075 100755 --- a/modules.d/95ssh-client/module-setup.sh +++ b/modules.d/95ssh-client/module-setup.sh @@ -5,11 +5,11 @@ @@ -602,7 +602,7 @@ index c7d8ee2..6b44107 100755 [ ! -f $sshkey ] && { derror "ssh key: $sshkey is not found!" diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index 094479a..fdea8c6 100755 +index 094479a3..fdea8c6d 100755 --- a/modules.d/95udev-rules/module-setup.sh +++ b/modules.d/95udev-rules/module-setup.sh @@ -5,7 +5,7 @@ @@ -615,7 +615,7 @@ index 094479a..fdea8c6 100755 # of the rules we want so that we just copy those in would be best inst_multiple udevadm cat uname blkid \ diff --git a/modules.d/95zfcp/module-setup.sh b/modules.d/95zfcp/module-setup.sh -index 9906695..d19eba4 100755 +index 99066958..d19eba4c 100755 --- a/modules.d/95zfcp/module-setup.sh +++ b/modules.d/95zfcp/module-setup.sh @@ -6,6 +6,8 @@ check() { @@ -628,7 +628,7 @@ index 9906695..d19eba4 100755 } diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh -index 16f8493..b052ec3 100755 +index 16f84938..b052ec37 100755 --- a/modules.d/95znet/module-setup.sh +++ b/modules.d/95znet/module-setup.sh @@ -6,6 +6,8 @@ check() { @@ -641,7 +641,7 @@ index 16f8493..b052ec3 100755 } diff --git a/modules.d/97biosdevname/module-setup.sh b/modules.d/97biosdevname/module-setup.sh -index 4a0b4f4..fd4d463 100755 +index 4a0b4f41..fd4d4632 100755 --- a/modules.d/97biosdevname/module-setup.sh +++ b/modules.d/97biosdevname/module-setup.sh @@ -4,7 +4,7 @@ @@ -654,7 +654,7 @@ index 4a0b4f4..fd4d463 100755 } diff --git a/modules.d/97masterkey/module-setup.sh b/modules.d/97masterkey/module-setup.sh -index a94c4f5..cda6e80 100755 +index a94c4f53..cda6e809 100755 --- a/modules.d/97masterkey/module-setup.sh +++ b/modules.d/97masterkey/module-setup.sh @@ -4,7 +4,7 @@ @@ -667,7 +667,7 @@ index a94c4f5..cda6e80 100755 return 255 diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index aae0319..d0271f1 100755 +index aae0319a..d0271f15 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -4,7 +4,7 @@ @@ -680,7 +680,7 @@ index aae0319..d0271f1 100755 (( $SYSTEMD_VERSION >= 198 )) && return 0 return 255 diff --git a/modules.d/99img-lib/module-setup.sh b/modules.d/99img-lib/module-setup.sh -index 28bfc2a..a951b93 100755 +index 28bfc2aa..a951b930 100755 --- a/modules.d/99img-lib/module-setup.sh +++ b/modules.d/99img-lib/module-setup.sh @@ -2,9 +2,7 @@ diff --git a/SOURCES/0252-network-dhclient-script.sh-add-RENEW-REBIND.patch b/SOURCES/0252-network-dhclient-script.sh-add-RENEW-REBIND.patch index 15e71f5..33313b4 100644 --- a/SOURCES/0252-network-dhclient-script.sh-add-RENEW-REBIND.patch +++ b/SOURCES/0252-network-dhclient-script.sh-add-RENEW-REBIND.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/dhclient-script.sh: add RENEW/REBIND 1 file changed, 23 insertions(+) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index aef94d6..d96f7d9 100755 +index aef94d6c..d96f7d94 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -131,6 +131,17 @@ case $reason in diff --git a/SOURCES/0253-network-dhclient-script.sh-make-IPv4-DHCP-lease-time.patch b/SOURCES/0253-network-dhclient-script.sh-make-IPv4-DHCP-lease-time.patch index 86a866a..14b825d 100644 --- a/SOURCES/0253-network-dhclient-script.sh-make-IPv4-DHCP-lease-time.patch +++ b/SOURCES/0253-network-dhclient-script.sh-make-IPv4-DHCP-lease-time.patch @@ -13,7 +13,7 @@ server. 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index d96f7d9..7972af9 100755 +index d96f7d94..7972af99 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -23,7 +23,11 @@ setup_interface() { diff --git a/SOURCES/0254-network-don-t-use-ifup-m.patch b/SOURCES/0254-network-don-t-use-ifup-m.patch index d17aaef..3b86585 100644 --- a/SOURCES/0254-network-don-t-use-ifup-m.patch +++ b/SOURCES/0254-network-don-t-use-ifup-m.patch @@ -17,7 +17,7 @@ executed. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index bd7db02..3cff725 100755 +index bd7db02c..3cff725c 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -82,9 +82,10 @@ fi @@ -33,7 +33,7 @@ index bd7db02..3cff725 100755 [ -e /tmp/net.${netif}.did-setup ] && exit 0 [ -e /sys/class/net/$netif/address ] && \ diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 3664984..750a4d7 100755 +index 3664984f..750a4d7f 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -55,7 +55,6 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh diff --git a/SOURCES/0255-nfs-parse-nfsroot.sh-don-t-unset-netroot-if-not-nfs.patch b/SOURCES/0255-nfs-parse-nfsroot.sh-don-t-unset-netroot-if-not-nfs.patch index 1e180d8..ebad176 100644 --- a/SOURCES/0255-nfs-parse-nfsroot.sh-don-t-unset-netroot-if-not-nfs.patch +++ b/SOURCES/0255-nfs-parse-nfsroot.sh-don-t-unset-netroot-if-not-nfs.patch @@ -9,7 +9,7 @@ Subject: [PATCH] nfs/parse-nfsroot.sh: don't unset netroot, if not nfs 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh -index 9fc2a8c..a84cd43 100755 +index 9fc2a8c3..a84cd436 100755 --- a/modules.d/95nfs/parse-nfsroot.sh +++ b/modules.d/95nfs/parse-nfsroot.sh @@ -59,7 +59,14 @@ fi diff --git a/SOURCES/0256-Change-the-fs_passno-of-nfs-to-0.patch b/SOURCES/0256-Change-the-fs_passno-of-nfs-to-0.patch index e1a2b38..f7ff267 100644 --- a/SOURCES/0256-Change-the-fs_passno-of-nfs-to-0.patch +++ b/SOURCES/0256-Change-the-fs_passno-of-nfs-to-0.patch @@ -24,7 +24,7 @@ Signed-off-by: Chao Fan 1 file changed, 1 insertion(+) diff --git a/dracut.sh b/dracut.sh -index 0e60022..cc22a14 100755 +index 0e600220..cc22a14d 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1348,6 +1348,7 @@ if [[ $kernel_only != yes ]]; then diff --git a/SOURCES/0257-nfs-nfs-lib.sh-add-anaconda_nfsv6_to_var.patch b/SOURCES/0257-nfs-nfs-lib.sh-add-anaconda_nfsv6_to_var.patch index 168ca64..f1e0807 100644 --- a/SOURCES/0257-nfs-nfs-lib.sh-add-anaconda_nfsv6_to_var.patch +++ b/SOURCES/0257-nfs-nfs-lib.sh-add-anaconda_nfsv6_to_var.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1190098 1 file changed, 18 insertions(+) diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh -index bf7d044..4f24f69 100755 +index bf7d044b..4f24f698 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -17,6 +17,7 @@ nfs_to_var() { diff --git a/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch b/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch index 40e8d03..5c173ef 100644 --- a/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch +++ b/SOURCES/0258-splitup-dracut-init.sh-from-dracut-functions.sh.patch @@ -33,7 +33,7 @@ effects. create mode 100644 dracut-init.sh diff --git a/Makefile b/Makefile -index 5441d8f..18f5a88 100644 +index 5441d8f4..18f5a88c 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,7 @@ install: dracut-version.sh @@ -45,7 +45,7 @@ index 5441d8f..18f5a88 100644 install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions diff --git a/dracut-functions.sh b/dracut-functions.sh -index 4ea3204..31586ca 100755 +index 4ea3204d..31586ca4 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -22,14 +22,9 @@ @@ -67,7 +67,7 @@ index 4ea3204..31586ca 100755 # Generic substring function. If $2 is in $1, return 0. diff --git a/dracut-init.sh b/dracut-init.sh new file mode 100644 -index 0000000..469e42a +index 00000000..469e42ad --- /dev/null +++ b/dracut-init.sh @@ -0,0 +1,34 @@ @@ -106,7 +106,7 @@ index 0000000..469e42a +[[ $dracutbasedir ]] || export dracutbasedir=${BASH_SOURCE%/*} +. $dracutbasedir/dracut-functions.sh diff --git a/dracut.sh b/dracut.sh -index cc22a14..a214f81 100755 +index cc22a14d..a214f810 100755 --- a/dracut.sh +++ b/dracut.sh @@ -519,7 +519,7 @@ while :; do @@ -133,7 +133,7 @@ index cc22a14..a214f81 100755 printf "%s\n" "dracut: Try passing -l as an argument to $0" >&2 exit 1 diff --git a/dracut.spec b/dracut.spec -index 302cfc5..d22f586 100644 +index 302cfc5d..d22f5861 100644 --- a/dracut.spec +++ b/dracut.spec @@ -296,6 +296,7 @@ rm -rf -- $RPM_BUILD_ROOT @@ -145,7 +145,7 @@ index 302cfc5..d22f586 100644 %{dracutlibdir}/dracut-functions %{dracutlibdir}/dracut-version.sh diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh -index 02ebc23..642b250 100755 +index 02ebc231..642b250e 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -29,7 +29,7 @@ test_setup() { @@ -176,7 +176,7 @@ index 02ebc23..642b250 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh -index 2a8ed6b..4ebff83 100755 +index 2a8ed6b5..4ebff837 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -25,7 +25,7 @@ test_setup() { @@ -207,7 +207,7 @@ index 2a8ed6b..4ebff83 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh -index b8231fe..e772352 100755 +index b8231fed..e772352a 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -55,7 +55,7 @@ test_setup() { @@ -238,7 +238,7 @@ index b8231fe..e772352 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh -index aa83122..3834238 100755 +index aa83122c..38342386 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -57,7 +57,7 @@ test_setup() { @@ -269,7 +269,7 @@ index aa83122..3834238 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh -index d79d5cd..cf474df 100755 +index d79d5cd4..cf474dff 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -28,7 +28,7 @@ test_setup() { @@ -300,7 +300,7 @@ index d79d5cd..cf474df 100755 inst_hook emergency 000 ./hard-off.sh inst ./cryptroot-ask.sh /sbin/cryptroot-ask diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh -index 732d0c8..c3c27bc 100755 +index 732d0c8f..c3c27bce 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -24,7 +24,7 @@ test_setup() { @@ -331,7 +331,7 @@ index 732d0c8..c3c27bc 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh -index 87fe542..11f66b2 100755 +index 87fe542f..11f66b23 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -66,7 +66,7 @@ test_setup() { @@ -362,7 +362,7 @@ index 87fe542..11f66b2 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh -index 129620b..993f71d 100755 +index 129620b1..993f71db 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -62,7 +62,7 @@ test_setup() { @@ -393,7 +393,7 @@ index 129620b..993f71d 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh -index ad0cf7b..9465965 100755 +index ad0cf7b0..9465965c 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -54,7 +54,7 @@ test_setup() { @@ -424,7 +424,7 @@ index ad0cf7b..9465965 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh -index 71f5703..9b97136 100755 +index 71f5703a..9b971362 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -26,7 +26,7 @@ test_setup() { @@ -455,7 +455,7 @@ index 71f5703..9b97136 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh -index 252e845..c08a2a4 100755 +index 252e8454..c08a2a41 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -30,7 +30,7 @@ test_setup() { @@ -477,7 +477,7 @@ index 252e845..c08a2a4 100755 mount dmesg ifconfig dhclient mkdir cp ping dhclient \ umount strace less diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh -index 4c904b0..79e224e 100755 +index 4c904b0a..79e224e2 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -24,7 +24,7 @@ test_setup() { @@ -508,7 +508,7 @@ index 4c904b0..79e224e 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh -index 7b5e3c5..14350e9 100755 +index 7b5e3c5d..14350e98 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -221,7 +221,7 @@ test_setup() { @@ -539,7 +539,7 @@ index 7b5e3c5..14350e9 100755 inst_multiple poweroff shutdown inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index f597783..a258c04 100755 +index f5977839..a258c042 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -104,7 +104,7 @@ test_setup() { @@ -579,7 +579,7 @@ index f597783..a258c04 100755 cd "$initdir"; mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh -index 59494ed..abf1a4f 100755 +index 59494ed8..abf1a4f4 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -195,7 +195,7 @@ make_encrypted_root() { @@ -628,7 +628,7 @@ index 59494ed..abf1a4f 100755 inst_hook emergency 000 ./hard-off.sh inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index 3c6003b..4f73203 100755 +index 3c6003b4..4f73203f 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -150,7 +150,7 @@ test_setup() { diff --git a/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch b/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch index 8ca30d5..fcb5280 100644 --- a/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch +++ b/SOURCES/0259-Adding-support-for-read-write-filesystem-images.patch @@ -21,7 +21,7 @@ Signed-off-by: Major Hayden 3 files changed, 96 insertions(+), 4 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index bce8608..0493dcd 100644 +index bce86084..0493dcd8 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -729,10 +729,90 @@ rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo @@ -117,7 +117,7 @@ index bce8608..0493dcd 100644 **rd.plymouth=0**:: disable the plymouth bootsplash only for the initramfs. diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 5705e8d..c6c02c7 100755 +index 5705e8df..c6c02c74 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -4,6 +4,8 @@ @@ -159,7 +159,7 @@ index 5705e8d..c6c02c7 100755 # we might have an embedded fs image on squashfs (compressed live) diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh -index c6d1f9d..f52717d 100755 +index c6d1f9d5..f52717de 100755 --- a/modules.d/90dmsquash-live/module-setup.sh +++ b/modules.d/90dmsquash-live/module-setup.sh @@ -11,7 +11,7 @@ check() { diff --git a/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch b/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch index 33b2569..a8d15f6 100644 --- a/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch +++ b/SOURCES/0260-dmsquash-Add-rd.live.overlay.thin.patch @@ -18,7 +18,7 @@ Signed-off-by: Fabian Deutsch 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 0493dcd..0c3bc29 100644 +index 0493dcd8..0c3bc295 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -802,6 +802,13 @@ Enables debug output from the live boot process. @@ -36,7 +36,7 @@ index 0493dcd..0c3bc29 100644 Enables writable filesystem support. The system will boot with a fully writable filesystem without snapshots __(see notes above about available live boot options)__. diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index c6c02c7..0645a0b 100755 +index c6c02c74..0645a0bd 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -30,6 +30,8 @@ getargbool 0 rd.live.overlay.readonly -d -y readonly_overlay && readonly_overlay diff --git a/SOURCES/0261-dmsquash-live-setup-the-images-in-run-initramfs.patch b/SOURCES/0261-dmsquash-live-setup-the-images-in-run-initramfs.patch index f760866..5a8c6e6 100644 --- a/SOURCES/0261-dmsquash-live-setup-the-images-in-run-initramfs.patch +++ b/SOURCES/0261-dmsquash-live-setup-the-images-in-run-initramfs.patch @@ -12,7 +12,7 @@ works, but it is more sane to put them in /run/initramfs 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 0645a0b..12354f4 100755 +index 0645a0bd..12354f42 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -189,9 +189,9 @@ fi diff --git a/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch b/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch index 9df54bc..5b0fb06 100644 --- a/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch +++ b/SOURCES/0262-dmsquash-Add-squashfs-support-to-rd.live.fsimg.patch @@ -19,7 +19,7 @@ Signed-off-by: Fabian Deutsch 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 0c3bc29..1e89bd5 100644 +index 0c3bc295..1e89bd50 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -802,6 +802,10 @@ Enables debug output from the live boot process. @@ -46,7 +46,7 @@ index 0c3bc29..1e89bd5 100644 Plymouth Boot Splash diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 12354f4..64abc0b 100755 +index 12354f42..64abc0be 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -148,6 +148,7 @@ do_live_overlay() { diff --git a/SOURCES/0263-doc-Add-a-minimal-rd.live.overlay-documentation.patch b/SOURCES/0263-doc-Add-a-minimal-rd.live.overlay-documentation.patch index 502b124..7aea5b5 100644 --- a/SOURCES/0263-doc-Add-a-minimal-rd.live.overlay-documentation.patch +++ b/SOURCES/0263-doc-Add-a-minimal-rd.live.overlay-documentation.patch @@ -10,7 +10,7 @@ Signed-off-by: Fabian Deutsch 1 file changed, 12 insertions(+) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 1e89bd5..c7e3bd4 100644 +index 1e89bd50..c7e3bd40 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -806,6 +806,18 @@ can be found. By default, this is __LiveOS__. diff --git a/SOURCES/0264-50drm-add-hyperv_fb-kernel-module.patch b/SOURCES/0264-50drm-add-hyperv_fb-kernel-module.patch index 4d2615f..811dfd9 100644 --- a/SOURCES/0264-50drm-add-hyperv_fb-kernel-module.patch +++ b/SOURCES/0264-50drm-add-hyperv_fb-kernel-module.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1192035 1 file changed, 2 insertions(+) diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh -index bf33c5b..0e1c5ff 100755 +index bf33c5b7..0e1c5ff0 100755 --- a/modules.d/50drm/module-setup.sh +++ b/modules.d/50drm/module-setup.sh @@ -48,6 +48,8 @@ installkernel() { diff --git a/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch b/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch index db17be0..85373bb 100644 --- a/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch +++ b/SOURCES/0265-kernel-modules-install-all-HID-drivers.patch @@ -12,7 +12,7 @@ all the time, just include all HID drivers. 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 -index fba2bc1..34d85b1 100755 +index fba2bc1a..34d85b1c 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -40,20 +40,31 @@ installkernel() { diff --git a/SOURCES/0266-network-add-options-to-tweak-timeouts.patch b/SOURCES/0266-network-add-options-to-tweak-timeouts.patch index ff25ad9..573ae78 100644 --- a/SOURCES/0266-network-add-options-to-tweak-timeouts.patch +++ b/SOURCES/0266-network-add-options-to-tweak-timeouts.patch @@ -35,7 +35,7 @@ Subject: [PATCH] network: add options to tweak timeouts 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index c7e3bd4..5f3dead 100644 +index c7e3bd40..5f3dead1 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -572,6 +572,31 @@ NFS @@ -71,7 +71,7 @@ index c7e3bd4..5f3dead 100644 ~~~ **root=**cifs://[____[:____]@]____:____:: diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 3cff725..2f51e6d 100755 +index 3cff725c..2f51e6d5 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -98,15 +98,33 @@ do_dhcp() { @@ -113,7 +113,7 @@ index 3cff725..2f51e6d 100755 load_ipv6() { diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 1f77a15..de5273c 100755 +index 1f77a154..de5273ca 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -486,7 +486,11 @@ parse_ifname_opts() { diff --git a/SOURCES/0267-fcoe-start-with-fcoemon-instead-of-fipvlan.patch b/SOURCES/0267-fcoe-start-with-fcoemon-instead-of-fipvlan.patch index b603e4a..57c9c42 100644 --- a/SOURCES/0267-fcoe-start-with-fcoemon-instead-of-fipvlan.patch +++ b/SOURCES/0267-fcoe-start-with-fcoemon-instead-of-fipvlan.patch @@ -10,7 +10,7 @@ Subject: [PATCH] fcoe: start with fcoemon instead of fipvlan 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index edbfcc8..823d7ac 100755 +index edbfcc84..823d7acc 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -20,12 +20,28 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh @@ -42,20 +42,20 @@ index edbfcc8..823d7ac 100755 if [ "$dcb" = "dcb" ]; then # Note lldpad will stay running after switchroot, the system initscripts # are to kill it and start a new lldpad to take over. Data is transfered -@@ -52,6 +68,13 @@ if [ "$dcb" = "dcb" ]; then +@@ -51,6 +67,13 @@ if [ "$dcb" = "dcb" ]; then + i=$(($i+1)) done - while [ $i -lt 60 ]; do ++ while [ $i -lt 60 ]; do + dcbtool sc "$netif" pfc e:1 a:1 w:1 && break + info "Retrying to turn dcb on" + sleep 1 + i=$(($i+1)) + done + -+ while [ $i -lt 60 ]; do + while [ $i -lt 60 ]; do dcbtool sc "$netif" app:fcoe e:1 a:1 w:1 && break info "Retrying to turn fcoe on" - sleep 1 @@ -60,7 +83,8 @@ if [ "$dcb" = "dcb" ]; then sleep 1 @@ -78,7 +78,7 @@ index edbfcc8..823d7ac 100755 need_shutdown diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 8c6290d..ec573ea 100755 +index 8c6290d4..ec573ea0 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -3,7 +3,7 @@ @@ -105,7 +105,7 @@ index 8c6290d..ec573ea 100755 inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up" inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd" diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh -index dc40c82..7eca0b6 100755 +index dc40c825..7eca0b6c 100755 --- a/modules.d/95fcoe/parse-fcoe.sh +++ b/modules.d/95fcoe/parse-fcoe.sh @@ -22,13 +22,13 @@ diff --git a/SOURCES/0268-fcoe-EDD-parsing-patch-for-i40e.patch b/SOURCES/0268-fcoe-EDD-parsing-patch-for-i40e.patch index a6d7ce5..7b19eb0 100644 --- a/SOURCES/0268-fcoe-EDD-parsing-patch-for-i40e.patch +++ b/SOURCES/0268-fcoe-EDD-parsing-patch-for-i40e.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fcoe: EDD parsing patch for i40e 1 file changed, 13 insertions(+) diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh -index 5a81a2e..d0ea60d 100755 +index 5a81a2e3..d0ea60d5 100755 --- a/modules.d/95fcoe/fcoe-edd.sh +++ b/modules.d/95fcoe/fcoe-edd.sh @@ -11,8 +11,21 @@ fi diff --git a/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch b/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch index 4a09d1c..cd5ef21 100644 --- a/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch +++ b/SOURCES/0269-fcoe-fcoe-edd.sh-cleanup-the-script.patch @@ -11,7 +11,7 @@ Subject: [PATCH] fcoe/fcoe-edd.sh: cleanup the script 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh -index d0ea60d..8607b56 100755 +index d0ea60d5..8607b568 100755 --- a/modules.d/95fcoe/fcoe-edd.sh +++ b/modules.d/95fcoe/fcoe-edd.sh @@ -2,37 +2,55 @@ diff --git a/SOURCES/0270-livenet-don-t-attempt-to-download-the-image-for-ever.patch b/SOURCES/0270-livenet-don-t-attempt-to-download-the-image-for-ever.patch index 1ba27ac..8344585 100644 --- a/SOURCES/0270-livenet-don-t-attempt-to-download-the-image-for-ever.patch +++ b/SOURCES/0270-livenet-don-t-attempt-to-download-the-image-for-ever.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1152485 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules.d/90livenet/livenetroot.sh b/modules.d/90livenet/livenetroot.sh -index 1bbee55..2e36ee9 100755 +index 1bbee55b..2e36ee98 100755 --- a/modules.d/90livenet/livenetroot.sh +++ b/modules.d/90livenet/livenetroot.sh @@ -7,12 +7,20 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh diff --git a/SOURCES/0271-95fcoe-uefi-Test-for-EFI-firmware.patch b/SOURCES/0271-95fcoe-uefi-Test-for-EFI-firmware.patch index 01043b2..209ae74 100644 --- a/SOURCES/0271-95fcoe-uefi-Test-for-EFI-firmware.patch +++ b/SOURCES/0271-95fcoe-uefi-Test-for-EFI-firmware.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 3 insertions(+) diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 0fb06e2..f5277f4 100755 +index 0fb06e23..f5277f48 100755 --- a/modules.d/95fcoe-uefi/module-setup.sh +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -4,6 +4,9 @@ diff --git a/SOURCES/0272-base-Don-t-wait-for-swap-devices-in-host-only-mode.patch b/SOURCES/0272-base-Don-t-wait-for-swap-devices-in-host-only-mode.patch index d779817..8e01925 100644 --- a/SOURCES/0272-base-Don-t-wait-for-swap-devices-in-host-only-mode.patch +++ b/SOURCES/0272-base-Don-t-wait-for-swap-devices-in-host-only-mode.patch @@ -31,7 +31,7 @@ https://bugs.mageia.org/show_bug.cgi?id=12305 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index a214f81..90ac1fe 100755 +index a214f810..90ac1fe9 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1056,7 +1056,9 @@ if [[ $hostonly ]]; then @@ -55,7 +55,7 @@ index a214f81..90ac1fe 100755 systemdutildir systemdsystemunitdir systemdsystemconfdir \ host_modalias host_modules hostonly_cmdline loginstall \ diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh -index fddf4b0..d5e7861 100755 +index fddf4b06..d5e78613 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -104,6 +104,14 @@ install() { diff --git a/SOURCES/0273-dracut-functions.sh-check-if-dinfo-is-a-function.patch b/SOURCES/0273-dracut-functions.sh-check-if-dinfo-is-a-function.patch index 24b8df8..a659280 100644 --- a/SOURCES/0273-dracut-functions.sh-check-if-dinfo-is-a-function.patch +++ b/SOURCES/0273-dracut-functions.sh-check-if-dinfo-is-a-function.patch @@ -12,7 +12,7 @@ See: https://bugzilla.redhat.com/show_bug.cgi?id=1167082 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 31586ca..973e231 100755 +index 31586ca4..973e2312 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -169,7 +169,13 @@ srcmods="/lib/modules/$kernel/" diff --git a/SOURCES/0274-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch b/SOURCES/0274-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch index e07b422..9851b39 100644 --- a/SOURCES/0274-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch +++ b/SOURCES/0274-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch @@ -15,7 +15,7 @@ successful. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/90dmsquash-live/checkisomd5@.service b/modules.d/90dmsquash-live/checkisomd5@.service -index 20e40bd..c4ca10f 100644 +index 20e40bd7..c4ca10f3 100644 --- a/modules.d/90dmsquash-live/checkisomd5@.service +++ b/modules.d/90dmsquash-live/checkisomd5@.service @@ -11,3 +11,4 @@ StandardInput=tty-force @@ -24,7 +24,7 @@ index 20e40bd..c4ca10f 100644 TimeoutSec=0 +SuccessExitStatus=2 diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 64abc0b..8d5476c 100755 +index 64abc0be..8d5476cd 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -46,7 +46,7 @@ if [ -n "$check" ]; then diff --git a/SOURCES/0275-Add-rd.live.overlay.size-option.patch b/SOURCES/0275-Add-rd.live.overlay.size-option.patch index cb9df23..23baa2a 100644 --- a/SOURCES/0275-Add-rd.live.overlay.size-option.patch +++ b/SOURCES/0275-Add-rd.live.overlay.size-option.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Add rd.live.overlay.size option 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index 8d5476c..6631d9a 100755 +index 8d5476cd..6631d9a8 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh @@ -29,6 +29,8 @@ getargbool 0 rd.live.overlay.reset -d -y reset_overlay && reset_overlay="yes" diff --git a/SOURCES/0276-base-dracut-lib.sh-read-proc-cmdline-with-multiple-l.patch b/SOURCES/0276-base-dracut-lib.sh-read-proc-cmdline-with-multiple-l.patch index 591d9ed..e4351fd 100644 --- a/SOURCES/0276-base-dracut-lib.sh-read-proc-cmdline-with-multiple-l.patch +++ b/SOURCES/0276-base-dracut-lib.sh-read-proc-cmdline-with-multiple-l.patch @@ -11,7 +11,7 @@ also parse cmdline files without an ending newline 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 69f7079..3ffbb02 100755 +index 69f70799..3ffbb021 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -115,6 +115,7 @@ getcmdline() { diff --git a/SOURCES/0277-multipath-install-all-multipath-path-selector-kernel.patch b/SOURCES/0277-multipath-install-all-multipath-path-selector-kernel.patch index 9105aa7..a2bb660 100644 --- a/SOURCES/0277-multipath-install-all-multipath-path-selector-kernel.patch +++ b/SOURCES/0277-multipath-install-all-multipath-path-selector-kernel.patch @@ -21,7 +21,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1195392 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index d37f958..acfc56f 100755 +index d37f9587..acfc56f8 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -64,7 +64,7 @@ installkernel() { diff --git a/SOURCES/0278-man-page-changed-grub.conf-to-grub2.cfg.patch b/SOURCES/0278-man-page-changed-grub.conf-to-grub2.cfg.patch index 0252ffd..faeb375 100644 --- a/SOURCES/0278-man-page-changed-grub.conf-to-grub2.cfg.patch +++ b/SOURCES/0278-man-page-changed-grub.conf-to-grub2.cfg.patch @@ -8,7 +8,7 @@ Subject: [PATCH] man page: changed grub.conf to grub2.cfg 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dracut.usage.asc b/dracut.usage.asc -index bee9e2e..15dc244 100644 +index bee9e2e1..15dc2440 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -99,7 +99,7 @@ raid with encryption and LVM on top), as long as you specify the correct diff --git a/SOURCES/0279-lsinitrd.sh-ignore-cat-write-error-Broken-pipe.patch b/SOURCES/0279-lsinitrd.sh-ignore-cat-write-error-Broken-pipe.patch index b932177..89d413f 100644 --- a/SOURCES/0279-lsinitrd.sh-ignore-cat-write-error-Broken-pipe.patch +++ b/SOURCES/0279-lsinitrd.sh-ignore-cat-write-error-Broken-pipe.patch @@ -8,7 +8,7 @@ Subject: [PATCH] lsinitrd.sh: ignore "cat: write error: Broken pipe" 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lsinitrd.sh b/lsinitrd.sh -index b086a63..88fe983 100755 +index b086a635..88fe9834 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -116,7 +116,7 @@ extract_files() diff --git a/SOURCES/0280-network-setup-gateway-after-setting-up-resolv.conf.patch b/SOURCES/0280-network-setup-gateway-after-setting-up-resolv.conf.patch index 6cf2019..c7f1f63 100644 --- a/SOURCES/0280-network-setup-gateway-after-setting-up-resolv.conf.patch +++ b/SOURCES/0280-network-setup-gateway-after-setting-up-resolv.conf.patch @@ -12,7 +12,7 @@ afterwards, it should be able to resolve DNS 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index de5273c..cfc06fe 100755 +index de5273ca..cfc06feb 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -96,13 +96,13 @@ setup_net() { diff --git a/SOURCES/0281-Add-support-for-ethernet-point-to-point-connections-.patch b/SOURCES/0281-Add-support-for-ethernet-point-to-point-connections-.patch index 8375bd4..787114e 100644 --- a/SOURCES/0281-Add-support-for-ethernet-point-to-point-connections-.patch +++ b/SOURCES/0281-Add-support-for-ethernet-point-to-point-connections-.patch @@ -26,7 +26,7 @@ Signed-off-by: Gerd von Egidy 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 7972af9..12e2869 100755 +index 7972af99..12e2869f 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -49,7 +49,13 @@ setup_interface() { diff --git a/SOURCES/0282-lvm-add-cache-tools-for-dm-cache-usage.patch b/SOURCES/0282-lvm-add-cache-tools-for-dm-cache-usage.patch index 9a2a975..cf78d7f 100644 --- a/SOURCES/0282-lvm-add-cache-tools-for-dm-cache-usage.patch +++ b/SOURCES/0282-lvm-add-cache-tools-for-dm-cache-usage.patch @@ -9,7 +9,7 @@ Subject: [PATCH] lvm: add cache tools for dm-cache usage 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 5ec6281..90bc39f 100755 +index 5ec62812..90bc39f7 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -107,12 +107,19 @@ install() { diff --git a/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch b/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch index 1953af7..b3d257b 100644 --- a/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch +++ b/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch @@ -9,7 +9,7 @@ older kernels had the drbg kernel module and didn't need it 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index dbc87a4..bd37d9a 100755 +index dbc87a43..bd37d9a5 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -23,7 +23,8 @@ depends() { diff --git a/SOURCES/0284-dracut-functions.sh-degrade-info-about-missing-binar.patch b/SOURCES/0284-dracut-functions.sh-degrade-info-about-missing-binar.patch index 020014c..79a8a94 100644 --- a/SOURCES/0284-dracut-functions.sh-degrade-info-about-missing-binar.patch +++ b/SOURCES/0284-dracut-functions.sh-degrade-info-about-missing-binar.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut-functions.sh: degrade info about missing binaries to 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 973e231..65ccebe 100755 +index 973e2312..65ccebe5 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -44,7 +44,7 @@ require_binaries() { diff --git a/SOURCES/0285-dracut-functions.sh-require_binaries-clarify-message.patch b/SOURCES/0285-dracut-functions.sh-require_binaries-clarify-message.patch index 18d4312..77beaae 100644 --- a/SOURCES/0285-dracut-functions.sh-require_binaries-clarify-message.patch +++ b/SOURCES/0285-dracut-functions.sh-require_binaries-clarify-message.patch @@ -15,7 +15,7 @@ dependency modules, please submit patches. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 65ccebe..585b683 100755 +index 65ccebe5..585b6836 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -44,7 +44,7 @@ require_binaries() { diff --git a/SOURCES/0286-dracut-systemd-dracut-initqueue.sh-be-verbose-about-.patch b/SOURCES/0286-dracut-systemd-dracut-initqueue.sh-be-verbose-about-.patch index 7b7fc65..64dcafc 100644 --- a/SOURCES/0286-dracut-systemd-dracut-initqueue.sh-be-verbose-about-.patch +++ b/SOURCES/0286-dracut-systemd-dracut-initqueue.sh-be-verbose-about-.patch @@ -11,7 +11,7 @@ Issue a warning, if timeout scripts are executed 1 file changed, 1 insertion(+) diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 37bc18f..5822556 100755 +index 37bc18f1..5822556b 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -57,6 +57,7 @@ while :; do diff --git a/SOURCES/0287-nfs-parse-nfsroot.sh-silence-useless-warning-if-netr.patch b/SOURCES/0287-nfs-parse-nfsroot.sh-silence-useless-warning-if-netr.patch index c8a92ed..5de8170 100644 --- a/SOURCES/0287-nfs-parse-nfsroot.sh-silence-useless-warning-if-netr.patch +++ b/SOURCES/0287-nfs-parse-nfsroot.sh-silence-useless-warning-if-netr.patch @@ -10,7 +10,7 @@ Subject: [PATCH] nfs/parse-nfsroot.sh: silence useless warning if netroot is 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh -index a84cd43..865e62b 100755 +index a84cd436..865e62b8 100755 --- a/modules.d/95nfs/parse-nfsroot.sh +++ b/modules.d/95nfs/parse-nfsroot.sh @@ -40,7 +40,7 @@ if [ -n "$netroot" ] ; then diff --git a/SOURCES/0288-network-parse-ip-opts.sh-assume-rd.neednet-for-multi.patch b/SOURCES/0288-network-parse-ip-opts.sh-assume-rd.neednet-for-multi.patch index 40e4289..465fc45 100644 --- a/SOURCES/0288-network-parse-ip-opts.sh-assume-rd.neednet-for-multi.patch +++ b/SOURCES/0288-network-parse-ip-opts.sh-assume-rd.neednet-for-multi.patch @@ -12,7 +12,7 @@ set rd.neednet on the kernel cmdline to disable this behaviour 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 5b96e06..faee8f9 100755 +index 5b96e069..faee8f99 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -38,8 +38,10 @@ unset count diff --git a/SOURCES/0289-systemd-add-systemd-run-and-systemd-escape.patch b/SOURCES/0289-systemd-add-systemd-run-and-systemd-escape.patch index c334014..499cb55 100644 --- a/SOURCES/0289-systemd-add-systemd-run-and-systemd-escape.patch +++ b/SOURCES/0289-systemd-add-systemd-run-and-systemd-escape.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd: add systemd-run and systemd-escape 1 file changed, 1 insertion(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index d0271f1..a656fe0 100755 +index d0271f15..a656fe0f 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -123,6 +123,7 @@ install() { diff --git a/SOURCES/0290-network-net-lib.sh-add-is_ip.patch b/SOURCES/0290-network-net-lib.sh-add-is_ip.patch index 4da3898..6b8b5a1 100644 --- a/SOURCES/0290-network-net-lib.sh-add-is_ip.patch +++ b/SOURCES/0290-network-net-lib.sh-add-is_ip.patch @@ -11,7 +11,7 @@ add function to test if string is a valid IP 1 file changed, 12 insertions(+) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index cfc06fe..44c1bf0 100755 +index cfc06feb..44c1bf04 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -2,6 +2,18 @@ diff --git a/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch b/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch index ce210da..23ee115 100644 --- a/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch +++ b/SOURCES/0291-iscsi-integrate-with-systemd-and-improve-robustness.patch @@ -28,7 +28,7 @@ everything in the initqueue/timeout. 4 files changed, 134 insertions(+), 42 deletions(-) diff --git a/modules.d/95iscsi/cleanup-iscsi.sh b/modules.d/95iscsi/cleanup-iscsi.sh -index a2d5951..88a63e0 100755 +index a2d5951f..88a63e00 100755 --- a/modules.d/95iscsi/cleanup-iscsi.sh +++ b/modules.d/95iscsi/cleanup-iscsi.sh @@ -2,5 +2,5 @@ @@ -39,7 +39,7 @@ index a2d5951..88a63e0 100755 +[ -z "${DRACUT_SYSTEMD}" ] && [ -e /sys/module/bnx2i ] && killproc iscsiuio diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 1de6fb7..68da9dd 100755 +index 1de6fb75..68da9dd0 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -38,7 +38,7 @@ iroot=${iroot#:} @@ -222,7 +222,7 @@ index 1de6fb7..68da9dd 100755 # let the normal block handler handle root= exit $ret diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 49f9a0e..d12eb7d 100755 +index 49f9a0ed..d12eb7d8 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -83,6 +83,37 @@ install() { @@ -264,7 +264,7 @@ index 49f9a0e..d12eb7d 100755 dracut_need_initqueue } diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index b48be38..6a21b50 100755 +index b48be387..6a21b503 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -61,12 +61,13 @@ fi diff --git a/SOURCES/0292-dracut.cmdline.7.asc-document-rd.iscsi.waitnet-and-r.patch b/SOURCES/0292-dracut.cmdline.7.asc-document-rd.iscsi.waitnet-and-r.patch index 3df3b35..0f29f01 100644 --- a/SOURCES/0292-dracut.cmdline.7.asc-document-rd.iscsi.waitnet-and-r.patch +++ b/SOURCES/0292-dracut.cmdline.7.asc-document-rd.iscsi.waitnet-and-r.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut.cmdline.7.asc: document rd.iscsi.waitnet and 1 file changed, 6 insertions(+) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 5f3dead..1cf962e 100644 +index 5f3dead1..1cf962e6 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -704,6 +704,12 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30 diff --git a/SOURCES/0293-iscsi-parse-iscsiroot.sh-use-iBFT-initiator-name.patch b/SOURCES/0293-iscsi-parse-iscsiroot.sh-use-iBFT-initiator-name.patch index f209692..a1dcc09 100644 --- a/SOURCES/0293-iscsi-parse-iscsiroot.sh-use-iBFT-initiator-name.patch +++ b/SOURCES/0293-iscsi-parse-iscsiroot.sh-use-iBFT-initiator-name.patch @@ -9,7 +9,7 @@ Subject: [PATCH] iscsi/parse-iscsiroot.sh: use iBFT initiator name 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 6a21b50..2939e58 100755 +index 6a21b503..2939e58a 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -60,7 +60,7 @@ if [ -n "$iscsiroot" ] ; then diff --git a/SOURCES/0294-iscsi-iscsiroot.sh-handle-timeout-with-all-interface.patch b/SOURCES/0294-iscsi-iscsiroot.sh-handle-timeout-with-all-interface.patch index 9116ac0..5854708 100644 --- a/SOURCES/0294-iscsi-iscsiroot.sh-handle-timeout-with-all-interface.patch +++ b/SOURCES/0294-iscsi-iscsiroot.sh-handle-timeout-with-all-interface.patch @@ -11,7 +11,7 @@ restart iscsid, because it may disbehaved 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 68da9dd..9452afe 100755 +index 68da9dd0..9452afec 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -199,13 +199,14 @@ handle_netroot() diff --git a/SOURCES/0295-TEST-30-ISCSI-dhcpd.conf-set-the-LUN.patch b/SOURCES/0295-TEST-30-ISCSI-dhcpd.conf-set-the-LUN.patch index 21b517f..aa4c9d3 100644 --- a/SOURCES/0295-TEST-30-ISCSI-dhcpd.conf-set-the-LUN.patch +++ b/SOURCES/0295-TEST-30-ISCSI-dhcpd.conf-set-the-LUN.patch @@ -11,7 +11,7 @@ set the LUN, so the udev rule to mount the disk matches 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TEST-30-ISCSI/dhcpd.conf b/test/TEST-30-ISCSI/dhcpd.conf -index 6eb035b..22c1790 100644 +index 6eb035b2..22c17907 100644 --- a/test/TEST-30-ISCSI/dhcpd.conf +++ b/test/TEST-30-ISCSI/dhcpd.conf @@ -15,7 +15,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 { diff --git a/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch b/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch index b7896a7..fa49e99 100644 --- a/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch +++ b/SOURCES/0296-TEST-30-ISCSI-switch-to-scsi-target-utils.patch @@ -20,7 +20,7 @@ Test the new iSCSI parameters rd.iscsi.waitnet and rd.iscsi.testroute. delete mode 100644 test/TEST-30-ISCSI/targets diff --git a/README.testsuite b/README.testsuite -index f4955e0..247ed3a 100644 +index f4955e04..247ed3aa 100644 --- a/README.testsuite +++ b/README.testsuite @@ -1,14 +1,16 @@ @@ -50,7 +50,7 @@ index f4955e0..247ed3a 100644 How to run the testsuite: diff --git a/test/TEST-30-ISCSI/server-init.sh b/test/TEST-30-ISCSI/server-init.sh -index 4bdd5e3..64a4755 100755 +index 4bdd5e3c..64a47556 100755 --- a/test/TEST-30-ISCSI/server-init.sh +++ b/test/TEST-30-ISCSI/server-init.sh @@ -12,10 +12,30 @@ ip link set lo up @@ -88,7 +88,7 @@ index 4bdd5e3..64a4755 100755 poweroff -f diff --git a/test/TEST-30-ISCSI/targets b/test/TEST-30-ISCSI/targets deleted file mode 100644 -index 6a6872e..0000000 +index 6a6872e5..00000000 --- a/test/TEST-30-ISCSI/targets +++ /dev/null @@ -1,25 +0,0 @@ @@ -118,7 +118,7 @@ index 6a6872e..0000000 -target1 rw extent1 192.168.50.0/24 -target2 rw extent2 192.168.50.0/24 diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index a258c04..be3399a 100755 +index a258c042..be3399a3 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -3,8 +3,10 @@ TEST_DESCRIPTION="root filesystem over iSCSI" diff --git a/SOURCES/0297-iscsi-iscsiroot.sh-systemd-run-does-not-understand-n.patch b/SOURCES/0297-iscsi-iscsiroot.sh-systemd-run-does-not-understand-n.patch index becd7c8..0e45570 100644 --- a/SOURCES/0297-iscsi-iscsiroot.sh-systemd-run-does-not-understand-n.patch +++ b/SOURCES/0297-iscsi-iscsiroot.sh-systemd-run-does-not-understand-n.patch @@ -10,7 +10,7 @@ not yet on RHEL-7 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 9452afe..2ac9ed3 100755 +index 9452afec..2ac9ed32 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -186,7 +186,7 @@ handle_netroot() diff --git a/SOURCES/0298-iscsi-module-setup.sh-iscsid-need-var-lib-iscsi.patch b/SOURCES/0298-iscsi-module-setup.sh-iscsid-need-var-lib-iscsi.patch index a78f500..bd874b4 100644 --- a/SOURCES/0298-iscsi-module-setup.sh-iscsid-need-var-lib-iscsi.patch +++ b/SOURCES/0298-iscsi-module-setup.sh-iscsid-need-var-lib-iscsi.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/module-setup.sh: iscsid need /var/lib/iscsi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index d12eb7d..4ecba05 100755 +index d12eb7d8..4ecba05e 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -114,6 +114,6 @@ install() { diff --git a/SOURCES/0299-TEST-30-ISCSI-fix-test-to-run-with-new-iscsi.patch b/SOURCES/0299-TEST-30-ISCSI-fix-test-to-run-with-new-iscsi.patch index fc14c06..4b25834 100644 --- a/SOURCES/0299-TEST-30-ISCSI-fix-test-to-run-with-new-iscsi.patch +++ b/SOURCES/0299-TEST-30-ISCSI-fix-test-to-run-with-new-iscsi.patch @@ -10,7 +10,7 @@ Subject: [PATCH] TEST-30-ISCSI: fix test to run with new iscsi 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-30-ISCSI/client-init.sh -index e78db27..2e422cd 100755 +index e78db274..2e422cd5 100755 --- a/test/TEST-30-ISCSI/client-init.sh +++ b/test/TEST-30-ISCSI/client-init.sh @@ -1,14 +1,20 @@ @@ -36,7 +36,7 @@ index e78db27..2e422cd 100755 +fi poweroff -f diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh -index 2a4b920..5f4b32a 100755 +index 2a4b920e..5f4b32a2 100755 --- a/test/TEST-30-ISCSI/create-root.sh +++ b/test/TEST-30-ISCSI/create-root.sh @@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do @@ -49,7 +49,7 @@ index 2a4b920..5f4b32a 100755 mount /dev/sda /sysroot && \ cp -a -t /sysroot /source/* && \ diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index be3399a..92ddc86 100755 +index be3399a3..92ddc860 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -3,7 +3,7 @@ TEST_DESCRIPTION="root filesystem over iSCSI" diff --git a/SOURCES/0300-dracut-logger.sh-log-also-rest-of-line-without-retur.patch b/SOURCES/0300-dracut-logger.sh-log-also-rest-of-line-without-retur.patch index 85b9ba7..d07d863 100644 --- a/SOURCES/0300-dracut-logger.sh-log-also-rest-of-line-without-retur.patch +++ b/SOURCES/0300-dracut-logger.sh-log-also-rest-of-line-without-retur.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-logger.sh: log also rest of line without return 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-logger.sh b/dracut-logger.sh -index 70b0da4..ffa5616 100755 +index 70b0da4c..ffa56167 100755 --- a/dracut-logger.sh +++ b/dracut-logger.sh @@ -367,7 +367,7 @@ dlog() { diff --git a/SOURCES/0301-iscsi-handle-timeout-case-better.patch b/SOURCES/0301-iscsi-handle-timeout-case-better.patch index 8512509..7112862 100644 --- a/SOURCES/0301-iscsi-handle-timeout-case-better.patch +++ b/SOURCES/0301-iscsi-handle-timeout-case-better.patch @@ -9,7 +9,7 @@ Subject: [PATCH] iscsi: handle timeout case better 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 2ac9ed3..b7370f6 100755 +index 2ac9ed32..b7370f6f 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -108,7 +108,7 @@ handle_netroot() @@ -36,7 +36,7 @@ index 2ac9ed3..b7370f6 100755 # restart systemctl restart iscsid diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 2939e58..91cd463 100755 +index 2939e58a..91cd4630 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -42,7 +42,11 @@ if [ "${root%%:*}" = "iscsi" ] ; then diff --git a/SOURCES/0302-base-dracut-lib.sh-vinfo-vwarn-handle-lines-without-.patch b/SOURCES/0302-base-dracut-lib.sh-vinfo-vwarn-handle-lines-without-.patch index 54e6405..92af638 100644 --- a/SOURCES/0302-base-dracut-lib.sh-vinfo-vwarn-handle-lines-without-.patch +++ b/SOURCES/0302-base-dracut-lib.sh-vinfo-vwarn-handle-lines-without-.patch @@ -8,7 +8,7 @@ Subject: [PATCH] base/dracut-lib.sh:vinfo/vwarn handle lines without newline 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 3ffbb02..b6593a0 100755 +index 3ffbb021..b6593a06 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -67,13 +67,13 @@ else diff --git a/SOURCES/0303-systemd-dracut-cmdline.sh-print-out-cmdline-in-one-l.patch b/SOURCES/0303-systemd-dracut-cmdline.sh-print-out-cmdline-in-one-l.patch index d3d9fb3..e1546c7 100644 --- a/SOURCES/0303-systemd-dracut-cmdline.sh-print-out-cmdline-in-one-l.patch +++ b/SOURCES/0303-systemd-dracut-cmdline.sh-print-out-cmdline-in-one-l.patch @@ -8,7 +8,7 @@ Subject: [PATCH] systemd/dracut-cmdline.sh: print out cmdline in one line 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index 8a5ab2f..9d15663 100755 +index 8a5ab2ff..9d15663e 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -15,8 +15,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh diff --git a/SOURCES/0304-network-ifup.sh-let-dhcp-client-run-in-the-backgroun.patch b/SOURCES/0304-network-ifup.sh-let-dhcp-client-run-in-the-backgroun.patch index 1055d3e..7991cda 100644 --- a/SOURCES/0304-network-ifup.sh-let-dhcp-client-run-in-the-backgroun.patch +++ b/SOURCES/0304-network-ifup.sh-let-dhcp-client-run-in-the-backgroun.patch @@ -9,7 +9,7 @@ we need to renew the lease 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 2f51e6d..ab87578 100755 +index 2f51e6d5..ab87578e 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -114,7 +114,7 @@ do_dhcp() { diff --git a/SOURCES/0305-network-ifup.sh-arping-for-static-IPv4-addresses.patch b/SOURCES/0305-network-ifup.sh-arping-for-static-IPv4-addresses.patch index ee6d6d8..b76137c 100644 --- a/SOURCES/0305-network-ifup.sh-arping-for-static-IPv4-addresses.patch +++ b/SOURCES/0305-network-ifup.sh-arping-for-static-IPv4-addresses.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup.sh: arping for static IPv4 addresses 1 file changed, 4 insertions(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index ab87578..8a5a606 100755 +index ab87578e..8a5a6065 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -163,6 +163,10 @@ do_static() { diff --git a/SOURCES/0306-network-parse-ip-opts.sh-bind-enx-interface-to-the-M.patch b/SOURCES/0306-network-parse-ip-opts.sh-bind-enx-interface-to-the-M.patch index 1134509..b500afa 100644 --- a/SOURCES/0306-network-parse-ip-opts.sh-bind-enx-interface-to-the-M.patch +++ b/SOURCES/0306-network-parse-ip-opts.sh-bind-enx-interface-to-the-M.patch @@ -9,7 +9,7 @@ do it automatically for the persistent naming scheme 1 file changed, 10 insertions(+) diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index faee8f9..7c403f7 100755 +index faee8f99..7c403f79 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -113,6 +113,16 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0307-udev-rules-install-40-redhat.rules.patch b/SOURCES/0307-udev-rules-install-40-redhat.rules.patch index 5bff134..8b74c7b 100644 --- a/SOURCES/0307-udev-rules-install-40-redhat.rules.patch +++ b/SOURCES/0307-udev-rules-install-40-redhat.rules.patch @@ -8,7 +8,7 @@ Subject: [PATCH] udev-rules: install 40-redhat.rules 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index fdea8c6..e0f2e38 100755 +index fdea8c6d..e0f2e381 100755 --- a/modules.d/95udev-rules/module-setup.sh +++ b/modules.d/95udev-rules/module-setup.sh @@ -26,15 +26,26 @@ install() { diff --git a/SOURCES/0308-fcoe-cleanup-lldpad.patch b/SOURCES/0308-fcoe-cleanup-lldpad.patch index 0c4503d..0dd6edf 100644 --- a/SOURCES/0308-fcoe-cleanup-lldpad.patch +++ b/SOURCES/0308-fcoe-cleanup-lldpad.patch @@ -12,7 +12,7 @@ Resolves: rhbz#1246217 diff --git a/modules.d/95fcoe/cleanup-fcoe.sh b/modules.d/95fcoe/cleanup-fcoe.sh new file mode 100644 -index 0000000..5ff4d05 +index 00000000..5ff4d054 --- /dev/null +++ b/modules.d/95fcoe/cleanup-fcoe.sh @@ -0,0 +1,10 @@ @@ -27,7 +27,7 @@ index 0000000..5ff4d05 + echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab +fi diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index ec573ea..646cfa8 100755 +index ec573ea0..646cfa84 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -28,6 +28,7 @@ install() { diff --git a/SOURCES/0309-network-net-lib.sh-ibft-unset-gateway-or-dns-if-set-.patch b/SOURCES/0309-network-net-lib.sh-ibft-unset-gateway-or-dns-if-set-.patch index 5337ab6..ec4d918 100644 --- a/SOURCES/0309-network-net-lib.sh-ibft-unset-gateway-or-dns-if-set-.patch +++ b/SOURCES/0309-network-net-lib.sh-ibft-unset-gateway-or-dns-if-set-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/net-lib.sh:ibft unset gateway or dns, if set to 1 file changed, 3 insertions(+) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 44c1bf0..c820356 100755 +index 44c1bf04..c8203567 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -236,9 +236,12 @@ ibft_to_cmdline() { diff --git a/SOURCES/0310-network-dhclient-exit-arping-immediatly-if-we-get-an.patch b/SOURCES/0310-network-dhclient-exit-arping-immediatly-if-we-get-an.patch index b5e7dda..6ed1ceb 100644 --- a/SOURCES/0310-network-dhclient-exit-arping-immediatly-if-we-get-an.patch +++ b/SOURCES/0310-network-dhclient-exit-arping-immediatly-if-we-get-an.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/dhclient: exit arping immediatly, if we get an answer 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 12e2869..18b4100 100755 +index 12e2869f..18b41000 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -117,7 +117,7 @@ case $reason in diff --git a/SOURCES/0311-dmraid-only-scan-once-because-of-one-device.patch b/SOURCES/0311-dmraid-only-scan-once-because-of-one-device.patch index 367160a..3c80dc8 100644 --- a/SOURCES/0311-dmraid-only-scan-once-because-of-one-device.patch +++ b/SOURCES/0311-dmraid-only-scan-once-because-of-one-device.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dmraid: only scan once because of one device 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules -index 33e060b..de7e97e 100644 +index 33e060be..de7e97e5 100644 --- a/modules.d/90dmraid/61-dmraid-imsm.rules +++ b/modules.d/90dmraid/61-dmraid-imsm.rules @@ -24,6 +24,6 @@ PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && @@ -21,7 +21,7 @@ index 33e060b..de7e97e 100644 LABEL="dm_end" diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh -index 3753ddd..ce9a6b2 100755 +index 3753ddd7..ce9a6b20 100755 --- a/modules.d/90dmraid/dmraid.sh +++ b/modules.d/90dmraid/dmraid.sh @@ -4,6 +4,13 @@ diff --git a/SOURCES/0312-test-TEST-04-FULL-SYSTEMD-create-root.sh-modprobe-bt.patch b/SOURCES/0312-test-TEST-04-FULL-SYSTEMD-create-root.sh-modprobe-bt.patch index 9e97eb6..f4c2d40 100644 --- a/SOURCES/0312-test-TEST-04-FULL-SYSTEMD-create-root.sh-modprobe-bt.patch +++ b/SOURCES/0312-test-TEST-04-FULL-SYSTEMD-create-root.sh-modprobe-bt.patch @@ -9,7 +9,7 @@ why so ever... it used to load automatically 1 file changed, 1 insertion(+) diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh -index 86ad449..bfec5bf 100755 +index 86ad4491..bfec5bf1 100755 --- a/test/TEST-04-FULL-SYSTEMD/create-root.sh +++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh @@ -4,6 +4,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do diff --git a/SOURCES/0313-TEST-15-BTRFS-load-btrfs-module.patch b/SOURCES/0313-TEST-15-BTRFS-load-btrfs-module.patch index 896a8c5..02537c9 100644 --- a/SOURCES/0313-TEST-15-BTRFS-load-btrfs-module.patch +++ b/SOURCES/0313-TEST-15-BTRFS-load-btrfs-module.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-15-BTRFS: load btrfs module 1 file changed, 1 insertion(+) diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh -index b92f9c0..ba3b54e 100755 +index b92f9c00..ba3b54ec 100755 --- a/test/TEST-15-BTRFSRAID/create-root.sh +++ b/test/TEST-15-BTRFSRAID/create-root.sh @@ -3,6 +3,7 @@ diff --git a/SOURCES/0314-network-ifup.sh-do_static-error-out-if-interface-cou.patch b/SOURCES/0314-network-ifup.sh-do_static-error-out-if-interface-cou.patch index 26d4d46..612eb67 100644 --- a/SOURCES/0314-network-ifup.sh-do_static-error-out-if-interface-cou.patch +++ b/SOURCES/0314-network-ifup.sh-do_static-error-out-if-interface-cou.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/ifup.sh:do_static(): error out, if interface could 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 8a5a606..1ee89bf 100755 +index 8a5a6065..1ee89bf4 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -155,7 +155,11 @@ do_ipv6auto() { diff --git a/SOURCES/0315-network-ifup.sh-do_static-error-out-if-IP-is-already.patch b/SOURCES/0315-network-ifup.sh-do_static-error-out-if-IP-is-already.patch index 1c850c0..ab4475f 100644 --- a/SOURCES/0315-network-ifup.sh-do_static-error-out-if-IP-is-already.patch +++ b/SOURCES/0315-network-ifup.sh-do_static-error-out-if-IP-is-already.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/ifup.sh:do_static(): error out, if IP is already 1 file changed, 9 insertions(+) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 1ee89bf..e51b453 100755 +index 1ee89bf4..e51b453a 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -160,6 +160,15 @@ do_static() { diff --git a/SOURCES/0316-crypt-module-setup.sh-fixed-parsing-crypttab-with-no.patch b/SOURCES/0316-crypt-module-setup.sh-fixed-parsing-crypttab-with-no.patch index eb2765b..a893eb8 100644 --- a/SOURCES/0316-crypt-module-setup.sh-fixed-parsing-crypttab-with-no.patch +++ b/SOURCES/0316-crypt-module-setup.sh-fixed-parsing-crypttab-with-no.patch @@ -10,7 +10,7 @@ Subject: [PATCH] crypt/module-setup.sh: fixed parsing crypttab with no ending 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 90ac1fe..65824ec 100755 +index 90ac1fe9..65824ec7 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1045,7 +1045,7 @@ if [[ $hostonly ]]; then @@ -23,7 +23,7 @@ index 90ac1fe..65824ec 100755 [[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue [[ "$_o" ]] || _o="$_p" diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index bd37d9a..f8422fa 100755 +index bd37d9a5..f8422fa9 100755 --- a/modules.d/90crypt/module-setup.sh +++ b/modules.d/90crypt/module-setup.sh @@ -63,7 +63,7 @@ install() { diff --git a/SOURCES/0317-TEST-30-ISCSI-add-rd.scsi.firmware.patch b/SOURCES/0317-TEST-30-ISCSI-add-rd.scsi.firmware.patch index 927433c..275ce65 100644 --- a/SOURCES/0317-TEST-30-ISCSI-add-rd.scsi.firmware.patch +++ b/SOURCES/0317-TEST-30-ISCSI-add-rd.scsi.firmware.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-30-ISCSI: add rd.scsi.firmware 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index 92ddc86..fc4bdce 100755 +index 92ddc860..fc4bdce9 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -3,8 +3,9 @@ TEST_DESCRIPTION="root filesystem over iSCSI" diff --git a/SOURCES/0318-initqueue-add-online-queue.patch b/SOURCES/0318-initqueue-add-online-queue.patch index e06293c..0e3b7e0 100644 --- a/SOURCES/0318-initqueue-add-online-queue.patch +++ b/SOURCES/0318-initqueue-add-online-queue.patch @@ -8,7 +8,7 @@ Subject: [PATCH] initqueue: add online queue 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/99base/initqueue.sh b/modules.d/99base/initqueue.sh -index 854a36a..0f96fac 100755 +index 854a36a8..0f96fac4 100755 --- a/modules.d/99base/initqueue.sh +++ b/modules.d/99base/initqueue.sh @@ -15,6 +15,8 @@ while [ $# -gt 0 ]; do diff --git a/SOURCES/0319-dracut.spec-raise-systemd-requirement-to-219.patch b/SOURCES/0319-dracut.spec-raise-systemd-requirement-to-219.patch index 63f4244..4ae35ea 100644 --- a/SOURCES/0319-dracut.spec-raise-systemd-requirement-to-219.patch +++ b/SOURCES/0319-dracut.spec-raise-systemd-requirement-to-219.patch @@ -9,7 +9,7 @@ needs systemd-escape 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.spec b/dracut.spec -index d22f586..ad737c2 100644 +index d22f5861..ad737c25 100644 --- a/dracut.spec +++ b/dracut.spec @@ -94,7 +94,7 @@ Requires: kpartx diff --git a/SOURCES/0320-iscsi-iscsiroot.sh-handle-firmware-in-online-queue.patch b/SOURCES/0320-iscsi-iscsiroot.sh-handle-firmware-in-online-queue.patch index 0cac4d5..1029cf7 100644 --- a/SOURCES/0320-iscsi-iscsiroot.sh-handle-firmware-in-online-queue.patch +++ b/SOURCES/0320-iscsi-iscsiroot.sh-handle-firmware-in-online-queue.patch @@ -9,7 +9,7 @@ otherwise it does not get called, if no netroot is set 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index b7370f6..7688b28 100755 +index b7370f6f..7688b282 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -238,28 +238,26 @@ if [ "$netif" = "timeout" ] && all_ifaces_up; then diff --git a/SOURCES/0321-iscsi-parse-iscsiroot.sh-do-not-modify-netroot.patch b/SOURCES/0321-iscsi-parse-iscsiroot.sh-do-not-modify-netroot.patch index 12851b5..10ae568 100644 --- a/SOURCES/0321-iscsi-parse-iscsiroot.sh-do-not-modify-netroot.patch +++ b/SOURCES/0321-iscsi-parse-iscsiroot.sh-do-not-modify-netroot.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/parse-iscsiroot.sh: do not modify netroot 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 91cd463..e9444a5 100755 +index 91cd4630..e9444a5f 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -16,10 +16,17 @@ diff --git a/SOURCES/0322-iscsi-parse-iscsiroot.sh-handle-firmware-in-online-q.patch b/SOURCES/0322-iscsi-parse-iscsiroot.sh-handle-firmware-in-online-q.patch index c1446b4..a4057ca 100644 --- a/SOURCES/0322-iscsi-parse-iscsiroot.sh-handle-firmware-in-online-q.patch +++ b/SOURCES/0322-iscsi-parse-iscsiroot.sh-handle-firmware-in-online-q.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/parse-iscsiroot.sh: handle firmware in online queue 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index e9444a5..13a9502 100755 +index e9444a5f..13a95023 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -79,11 +79,11 @@ if [ -n "$iscsi_firmware" ] || getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then diff --git a/SOURCES/0323-iscsi-parse-iscsiroot.sh-restart-iscsid-with-try-res.patch b/SOURCES/0323-iscsi-parse-iscsiroot.sh-restart-iscsid-with-try-res.patch index 00f6f85..81b57d7 100644 --- a/SOURCES/0323-iscsi-parse-iscsiroot.sh-restart-iscsid-with-try-res.patch +++ b/SOURCES/0323-iscsi-parse-iscsiroot.sh-restart-iscsid-with-try-res.patch @@ -8,7 +8,7 @@ Subject: [PATCH] iscsi/parse-iscsiroot.sh: restart iscsid with try-restart 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 13a9502..6dd929f 100755 +index 13a95023..6dd929f3 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -105,7 +105,7 @@ if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; the diff --git a/SOURCES/0324-network-ifup.sh-save-return-value-of-ifup.patch b/SOURCES/0324-network-ifup.sh-save-return-value-of-ifup.patch index fcc2203..9ab952b 100644 --- a/SOURCES/0324-network-ifup.sh-save-return-value-of-ifup.patch +++ b/SOURCES/0324-network-ifup.sh-save-return-value-of-ifup.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup.sh: save return value of ifup 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index e51b453..2562af6 100755 +index e51b453a..2562af61 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -396,6 +396,7 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0325-network-also-mark-interfaces-up-with-their-MAC.patch b/SOURCES/0325-network-also-mark-interfaces-up-with-their-MAC.patch index 7a15b3e..d9b30d0 100644 --- a/SOURCES/0325-network-also-mark-interfaces-up-with-their-MAC.patch +++ b/SOURCES/0325-network-also-mark-interfaces-up-with-their-MAC.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network: also mark interfaces up with their MAC 2 files changed, 11 insertions(+) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 18b4100..761b0cd 100755 +index 18b41000..761b0cd2 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -139,6 +139,10 @@ case $reason in @@ -34,7 +34,7 @@ index 18b4100..761b0cd 100755 RENEW6|REBIND6) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 2562af6..d944126 100755 +index 2562af61..d944126c 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -400,6 +400,10 @@ for p in $(getargs ip=); do diff --git a/SOURCES/0326-network-ifup.sh-only-use-dhcp-on-unknown-interfaces-.patch b/SOURCES/0326-network-ifup.sh-only-use-dhcp-on-unknown-interfaces-.patch index 23e0a4a..eb79ac9 100644 --- a/SOURCES/0326-network-ifup.sh-only-use-dhcp-on-unknown-interfaces-.patch +++ b/SOURCES/0326-network-ifup.sh-only-use-dhcp-on-unknown-interfaces-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network/ifup.sh: only use dhcp on unknown interfaces for 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index d944126..005c2cc 100755 +index d944126c..005c2cc9 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -433,7 +433,7 @@ if [ ! -e /tmp/net.${netif}.up ]; then diff --git a/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch b/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch index b1a36ef..5639043 100644 --- a/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch +++ b/SOURCES/0327-multipath-add-hostonly-multipath.conf.patch @@ -9,7 +9,7 @@ Resolves: rhbz#994702 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index acfc56f..4971d18 100755 +index acfc56f8..4971d18d 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -2,18 +2,29 @@ diff --git a/SOURCES/0328-cms-cmsifup.sh-do-not-use-ifup-m.patch b/SOURCES/0328-cms-cmsifup.sh-do-not-use-ifup-m.patch index 2f99ac4..a3e0174 100644 --- a/SOURCES/0328-cms-cmsifup.sh-do-not-use-ifup-m.patch +++ b/SOURCES/0328-cms-cmsifup.sh-do-not-use-ifup-m.patch @@ -9,7 +9,7 @@ we don't want to bring the interface up several times 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/80cms/cmsifup.sh b/modules.d/80cms/cmsifup.sh -index b361650..9ffe971 100755 +index b3616504..9ffe971a 100755 --- a/modules.d/80cms/cmsifup.sh +++ b/modules.d/80cms/cmsifup.sh @@ -37,4 +37,4 @@ fi diff --git a/SOURCES/0329-network-ifup-fix-warning-about-not-bringing-interfac.patch b/SOURCES/0329-network-ifup-fix-warning-about-not-bringing-interfac.patch index 440cdf7..1ec2937 100644 --- a/SOURCES/0329-network-ifup-fix-warning-about-not-bringing-interfac.patch +++ b/SOURCES/0329-network-ifup-fix-warning-about-not-bringing-interfac.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup: fix warning about not bringing interface up 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 005c2cc..db9fb08 100755 +index 005c2cc9..db9fb085 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -156,7 +156,7 @@ do_static() { diff --git a/SOURCES/0330-network-net-lib.sh-fix-wait_for_if_up.patch b/SOURCES/0330-network-net-lib.sh-fix-wait_for_if_up.patch index 264bdd3..d5055ac 100644 --- a/SOURCES/0330-network-net-lib.sh-fix-wait_for_if_up.patch +++ b/SOURCES/0330-network-net-lib.sh-fix-wait_for_if_up.patch @@ -11,7 +11,7 @@ state can be UNKNOWN 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index c820356..6034a09 100755 +index c8203567..6034a091 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -523,7 +523,21 @@ wait_for_if_up() { diff --git a/SOURCES/0331-network-net-lib.sh-fix-IPv6-route-parsing.patch b/SOURCES/0331-network-net-lib.sh-fix-IPv6-route-parsing.patch index dd3686f..02113de 100644 --- a/SOURCES/0331-network-net-lib.sh-fix-IPv6-route-parsing.patch +++ b/SOURCES/0331-network-net-lib.sh-fix-IPv6-route-parsing.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/net-lib.sh: fix IPv6 route parsing 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 6034a09..9d22ec1 100755 +index 6034a091..9d22ec1c 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -121,7 +121,7 @@ setup_net() { diff --git a/SOURCES/0332-network-ifup-do-DHCP-for-BOOTDEV.patch b/SOURCES/0332-network-ifup-do-DHCP-for-BOOTDEV.patch index b8c66e8..c1b0873 100644 --- a/SOURCES/0332-network-ifup-do-DHCP-for-BOOTDEV.patch +++ b/SOURCES/0332-network-ifup-do-DHCP-for-BOOTDEV.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup: do DHCP for BOOTDEV 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index db9fb08..0471c42 100755 +index db9fb085..0471c425 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -430,11 +430,20 @@ fi diff --git a/SOURCES/0333-qemu-add-spapr-vscsi-kernel-module.patch b/SOURCES/0333-qemu-add-spapr-vscsi-kernel-module.patch index 79d4ce9..04da416 100644 --- a/SOURCES/0333-qemu-add-spapr-vscsi-kernel-module.patch +++ b/SOURCES/0333-qemu-add-spapr-vscsi-kernel-module.patch @@ -8,7 +8,7 @@ Subject: [PATCH] qemu: add spapr-vscsi kernel module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh -index 6779642..64eac9e 100755 +index 67796429..64eac9ed 100755 --- a/modules.d/90qemu/module-setup.sh +++ b/modules.d/90qemu/module-setup.sh @@ -25,5 +25,5 @@ installkernel() { diff --git a/SOURCES/0334-livenet-livenetroot.sh-fixed-error-condition.patch b/SOURCES/0334-livenet-livenetroot.sh-fixed-error-condition.patch index 42ef646..4ec5a34 100644 --- a/SOURCES/0334-livenet-livenetroot.sh-fixed-error-condition.patch +++ b/SOURCES/0334-livenet-livenetroot.sh-fixed-error-condition.patch @@ -9,7 +9,7 @@ copy&paste error 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90livenet/livenetroot.sh b/modules.d/90livenet/livenetroot.sh -index 2e36ee9..b7592bc 100755 +index 2e36ee98..b7592bc0 100755 --- a/modules.d/90livenet/livenetroot.sh +++ b/modules.d/90livenet/livenetroot.sh @@ -15,7 +15,7 @@ liveurl="${netroot#livenet:}" diff --git a/SOURCES/0335-iscsi-parse-iscsiroot.sh-only-set-initiator-name-if-.patch b/SOURCES/0335-iscsi-parse-iscsiroot.sh-only-set-initiator-name-if-.patch index 91c913a..b2a9eb5 100644 --- a/SOURCES/0335-iscsi-parse-iscsiroot.sh-only-set-initiator-name-if-.patch +++ b/SOURCES/0335-iscsi-parse-iscsiroot.sh-only-set-initiator-name-if-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] iscsi/parse-iscsiroot.sh: only set initiator-name, if not 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 6dd929f..6aa14f5 100755 +index 6dd929f3..6aa14f5b 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -118,12 +118,14 @@ fi diff --git a/SOURCES/0336-network-move-ip-ibft-handling-to-network-module.patch b/SOURCES/0336-network-move-ip-ibft-handling-to-network-module.patch index d8bd0ee..663c035 100644 --- a/SOURCES/0336-network-move-ip-ibft-handling-to-network-module.patch +++ b/SOURCES/0336-network-move-ip-ibft-handling-to-network-module.patch @@ -10,7 +10,7 @@ Subject: [PATCH] network: move "ip=ibft" handling to network module 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 3134b5f..6cbbe8f 100755 +index 3134b5ff..6cbbe8f7 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -64,6 +64,7 @@ installkernel() { @@ -22,7 +22,7 @@ index 3134b5f..6cbbe8f 100755 install() { diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh -index 643313d..6f7f4e9 100755 +index 643313dc..6f7f4e95 100755 --- a/modules.d/40network/parse-ibft.sh +++ b/modules.d/40network/parse-ibft.sh @@ -6,5 +6,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh @@ -34,7 +34,7 @@ index 643313d..6f7f4e9 100755 ibft_to_cmdline fi diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 6aa14f5..9546f12 100755 +index 6aa14f5b..9546f126 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -71,7 +71,7 @@ if [ -n "$iscsiroot" ] ; then diff --git a/SOURCES/0337-dracut.usage.asc-update-man-page.patch b/SOURCES/0337-dracut.usage.asc-update-man-page.patch index ffd3d02..fa55d81 100644 --- a/SOURCES/0337-dracut.usage.asc-update-man-page.patch +++ b/SOURCES/0337-dracut.usage.asc-update-man-page.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut.usage.asc: update man page 1 file changed, 23 insertions(+), 51 deletions(-) diff --git a/dracut.usage.asc b/dracut.usage.asc -index 15dc244..45cbf12 100644 +index 15dc2440..45cbf120 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -37,10 +37,14 @@ the --hostonly or -H option. Using this option, the resulting image will diff --git a/SOURCES/0338-network-dhclient-script.sh-fix-RENEW.patch b/SOURCES/0338-network-dhclient-script.sh-fix-RENEW.patch index 28f22a9..44a1060 100644 --- a/SOURCES/0338-network-dhclient-script.sh-fix-RENEW.patch +++ b/SOURCES/0338-network-dhclient-script.sh-fix-RENEW.patch @@ -11,7 +11,7 @@ new_prefix is apparently new_subnet_mask 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 761b0cd..6d4b9dd 100755 +index 761b0cd2..6d4b9dd1 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -10,9 +10,6 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh diff --git a/SOURCES/0339-network-add-all_ifaces_setup.patch b/SOURCES/0339-network-add-all_ifaces_setup.patch index 2c5a920..75243d6 100644 --- a/SOURCES/0339-network-add-all_ifaces_setup.patch +++ b/SOURCES/0339-network-add-all_ifaces_setup.patch @@ -12,7 +12,7 @@ and nameserver are setup. 1 file changed, 8 insertions(+) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 9d22ec1..60d3579 100755 +index 9d22ec1c..60d3579a 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -74,6 +74,14 @@ all_ifaces_up() { diff --git a/SOURCES/0340-iscsi-iscsiroot.sh-use-all_ifaces_setup.patch b/SOURCES/0340-iscsi-iscsiroot.sh-use-all_ifaces_setup.patch index 55263ad..48efde5 100644 --- a/SOURCES/0340-iscsi-iscsiroot.sh-use-all_ifaces_setup.patch +++ b/SOURCES/0340-iscsi-iscsiroot.sh-use-all_ifaces_setup.patch @@ -9,7 +9,7 @@ we want the route and gateway setup 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 7688b28..424d216 100755 +index 7688b282..424d2166 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -108,7 +108,7 @@ handle_netroot() diff --git a/SOURCES/0341-network-netroot.sh-better-handling-of-netroot-and-dh.patch b/SOURCES/0341-network-netroot.sh-better-handling-of-netroot-and-dh.patch index 3ecfe72..d740eb2 100644 --- a/SOURCES/0341-network-netroot.sh-better-handling-of-netroot-and-dh.patch +++ b/SOURCES/0341-network-netroot.sh-better-handling-of-netroot-and-dh.patch @@ -11,7 +11,7 @@ check cmdline directly for root=dhcp(6) and netroot=dhcp(6) 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh -index 8f6945f..3aa5a0d 100755 +index 8f6945fe..3aa5a0d2 100755 --- a/modules.d/40network/netroot.sh +++ b/modules.d/40network/netroot.sh @@ -14,6 +14,11 @@ command -v setup_net >/dev/null || . /lib/net-lib.sh diff --git 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 index 5daae9f..0892b80 100644 --- 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 @@ -11,7 +11,7 @@ unconditionally. 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index 424d216..ea1bead 100755 +index 424d2166..ea1bead7 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -45,29 +45,23 @@ fi diff --git a/SOURCES/0343-i18n-check-for-i18n_install_all-yes-rather-than-bein.patch b/SOURCES/0343-i18n-check-for-i18n_install_all-yes-rather-than-bein.patch index 6ffb31d..656a17a 100644 --- a/SOURCES/0343-i18n-check-for-i18n_install_all-yes-rather-than-bein.patch +++ b/SOURCES/0343-i18n-check-for-i18n_install_all-yes-rather-than-bein.patch @@ -13,7 +13,7 @@ patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 2c0a275..4fd8116 100755 +index 2c0a275c..4fd81162 100755 --- a/modules.d/10i18n/module-setup.sh +++ b/modules.d/10i18n/module-setup.sh @@ -241,7 +241,7 @@ install() { diff --git a/SOURCES/0344-dracut.sh-add-command-line-option-for-install_i18_al.patch b/SOURCES/0344-dracut.sh-add-command-line-option-for-install_i18_al.patch index a775ecd..7ca60ee 100644 --- a/SOURCES/0344-dracut.sh-add-command-line-option-for-install_i18_al.patch +++ b/SOURCES/0344-dracut.sh-add-command-line-option-for-install_i18_al.patch @@ -10,7 +10,7 @@ Subject: [PATCH] dracut.sh: add command line option for install_i18_all 1 file changed, 7 insertions(+) diff --git a/dracut.sh b/dracut.sh -index 65824ec..d5f864f 100755 +index 65824ec7..d5f864f9 100755 --- a/dracut.sh +++ b/dracut.sh @@ -369,6 +369,8 @@ rearrange_params() diff --git a/SOURCES/0345-dracut.sh-do-not-create-microcode-if-no-firmware-is-.patch b/SOURCES/0345-dracut.sh-do-not-create-microcode-if-no-firmware-is-.patch index 3bb7823..e2501f2 100644 --- a/SOURCES/0345-dracut.sh-do-not-create-microcode-if-no-firmware-is-.patch +++ b/SOURCES/0345-dracut.sh-do-not-create-microcode-if-no-firmware-is-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.sh: do not create microcode, if no firmware is 1 file changed, 4 insertions(+) diff --git a/dracut.sh b/dracut.sh -index d5f864f..980c7ff 100755 +index d5f864f9..980c7ff9 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1493,6 +1493,10 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0346-scsi-parse-iscsiroot.sh-call-modprobe-with-b.patch b/SOURCES/0346-scsi-parse-iscsiroot.sh-call-modprobe-with-b.patch index 1deee7b..74135c3 100644 --- a/SOURCES/0346-scsi-parse-iscsiroot.sh-call-modprobe-with-b.patch +++ b/SOURCES/0346-scsi-parse-iscsiroot.sh-call-modprobe-with-b.patch @@ -9,7 +9,7 @@ honor, if a module is blacklisted 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 9546f12..f19147f 100755 +index 9546f126..f19147f6 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -88,11 +88,11 @@ fi diff --git a/SOURCES/0347-iscsi-parse-iscsiroot.sh-correct-handling-if-netroot.patch b/SOURCES/0347-iscsi-parse-iscsiroot.sh-correct-handling-if-netroot.patch index 896e87f..27f268f 100644 --- a/SOURCES/0347-iscsi-parse-iscsiroot.sh-correct-handling-if-netroot.patch +++ b/SOURCES/0347-iscsi-parse-iscsiroot.sh-correct-handling-if-netroot.patch @@ -10,7 +10,7 @@ corrects bfe65f913a4bc6bc5fdb7aa75234c229a2ceef8f 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index f19147f..3d74ff2 100755 +index f19147f6..3d74ff2e 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -84,7 +84,9 @@ if [ -n "$iscsi_firmware" ]; then diff --git a/SOURCES/0348-dracut.sh-no-microcode-if-get_ucode_file-returns-emp.patch b/SOURCES/0348-dracut.sh-no-microcode-if-get_ucode_file-returns-emp.patch index da5d948..f193268 100644 --- a/SOURCES/0348-dracut.sh-no-microcode-if-get_ucode_file-returns-emp.patch +++ b/SOURCES/0348-dracut.sh-no-microcode-if-get_ucode_file-returns-emp.patch @@ -9,7 +9,7 @@ check, if get_ucode_file() returned an empty string. 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 980c7ff..4e4f222 100755 +index 980c7ff9..4e4f222b 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1489,12 +1489,12 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0349-network-wait_for_ifup-handle-NO-CARRIER-output.patch b/SOURCES/0349-network-wait_for_ifup-handle-NO-CARRIER-output.patch index e3c1d19..a395cff 100644 --- a/SOURCES/0349-network-wait_for_ifup-handle-NO-CARRIER-output.patch +++ b/SOURCES/0349-network-wait_for_ifup-handle-NO-CARRIER-output.patch @@ -9,7 +9,7 @@ if "NO-CARRIER" is one of the flags, we surely have no link yet. 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 60d3579..995d32f 100755 +index 60d3579a..995d32f6 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -531,20 +531,22 @@ wait_for_if_up() { diff --git a/SOURCES/0350-base-dracut-lib.sh-info-be-more-quiet.patch b/SOURCES/0350-base-dracut-lib.sh-info-be-more-quiet.patch index fd43e1d..bfd0b3b 100644 --- a/SOURCES/0350-base-dracut-lib.sh-info-be-more-quiet.patch +++ b/SOURCES/0350-base-dracut-lib.sh-info-be-more-quiet.patch @@ -8,7 +8,7 @@ Subject: [PATCH] base/dracut-lib.sh:info() be more quiet 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index b6593a0..50bcf84 100755 +index b6593a06..50bcf840 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -61,7 +61,9 @@ else diff --git a/SOURCES/0351-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch b/SOURCES/0351-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch index e260a00..b0a65e6 100644 --- a/SOURCES/0351-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch +++ b/SOURCES/0351-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch @@ -19,7 +19,7 @@ directories in the initramfs image. 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 585b683..9218779 100755 +index 585b6836..9218779c 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -97,17 +97,7 @@ fi diff --git a/SOURCES/0352-dracut.sh-fixed-typo-in-microcode-generation.patch b/SOURCES/0352-dracut.sh-fixed-typo-in-microcode-generation.patch index abe8c32..9862797 100644 --- a/SOURCES/0352-dracut.sh-fixed-typo-in-microcode-generation.patch +++ b/SOURCES/0352-dracut.sh-fixed-typo-in-microcode-generation.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.sh: fixed typo in microcode generation 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 4e4f222..5b72221 100755 +index 4e4f222b..5b72221e 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1489,7 +1489,7 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0353-90qemu-fixed-systemd-detect-virt-output-parsing.patch b/SOURCES/0353-90qemu-fixed-systemd-detect-virt-output-parsing.patch index 27d527c..96de38d 100644 --- a/SOURCES/0353-90qemu-fixed-systemd-detect-virt-output-parsing.patch +++ b/SOURCES/0353-90qemu-fixed-systemd-detect-virt-output-parsing.patch @@ -14,7 +14,7 @@ Also, add "Red Hat" as a vendor. 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh -index 64eac9e..46b7ae2 100755 +index 64eac9ed..46b7ae21 100755 --- a/modules.d/90qemu/module-setup.sh +++ b/modules.d/90qemu/module-setup.sh @@ -4,7 +4,7 @@ diff --git a/SOURCES/0354-ifcfg-write-ifcfg.sh-unset-vlan.patch b/SOURCES/0354-ifcfg-write-ifcfg.sh-unset-vlan.patch index ba671b7..29092a9 100644 --- a/SOURCES/0354-ifcfg-write-ifcfg.sh-unset-vlan.patch +++ b/SOURCES/0354-ifcfg-write-ifcfg.sh-unset-vlan.patch @@ -12,7 +12,7 @@ was a vlan interface 1 file changed, 2 insertions(+) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index b2462da..ed66370 100755 +index b2462dae..ed66370f 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -140,6 +140,8 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0355-base-dracut-lib.sh-getargs-don-t-return-1-for-empty-.patch b/SOURCES/0355-base-dracut-lib.sh-getargs-don-t-return-1-for-empty-.patch index 2691908..d950877 100644 --- a/SOURCES/0355-base-dracut-lib.sh-getargs-don-t-return-1-for-empty-.patch +++ b/SOURCES/0355-base-dracut-lib.sh-getargs-don-t-return-1-for-empty-.patch @@ -11,7 +11,7 @@ So, return the values only. 1 file changed, 2 deletions(-) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 50bcf84..cb1ddd7 100755 +index 50bcf840..cb1ddd76 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -320,8 +320,6 @@ getargs() { diff --git a/SOURCES/0356-ifcfg-write-ifcfg.sh-don-t-bind-interface-if-physica.patch b/SOURCES/0356-ifcfg-write-ifcfg.sh-don-t-bind-interface-if-physica.patch index 071e739..5c53b7e 100644 --- a/SOURCES/0356-ifcfg-write-ifcfg.sh-don-t-bind-interface-if-physica.patch +++ b/SOURCES/0356-ifcfg-write-ifcfg.sh-don-t-bind-interface-if-physica.patch @@ -11,7 +11,7 @@ the MAC address or something else. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index ed66370..1e7f694 100755 +index ed66370f..1e7f694a 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -141,6 +141,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0357-network-ifup.sh-skip-empty-nameserver-values.patch b/SOURCES/0357-network-ifup.sh-skip-empty-nameserver-values.patch index 21a8599..065a253 100644 --- a/SOURCES/0357-network-ifup.sh-skip-empty-nameserver-values.patch +++ b/SOURCES/0357-network-ifup.sh-skip-empty-nameserver-values.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/ifup.sh: skip empty nameserver values 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 0471c42..7c06cd8 100755 +index 0471c425..7c06cd86 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -336,8 +336,8 @@ fi diff --git a/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch b/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch index 926e0c9..0086c87 100644 --- a/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch +++ b/SOURCES/0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch @@ -10,7 +10,7 @@ Also there is no DEVICE in the output. 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index 1e7f694..f3a1c10 100755 +index 1e7f694a..f3a1c109 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -141,7 +141,6 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch b/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch index a07e594..b000605 100644 --- a/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch +++ b/SOURCES/0359-90qemu-also-add-ibmvscsi-on-qemu.patch @@ -12,7 +12,7 @@ data disk. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh -index 46b7ae2..4dd5a73 100755 +index 46b7ae21..4dd5a73f 100755 --- a/modules.d/90qemu/module-setup.sh +++ b/modules.d/90qemu/module-setup.sh @@ -26,5 +26,5 @@ installkernel() { diff --git a/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch b/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch index e1aa363..65e855a 100644 --- a/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch +++ b/SOURCES/0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch @@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1276983 1 file changed, 2 deletions(-) diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh -index afe3466..4c3eefc 100755 +index afe34668..4c3eefcd 100755 --- a/modules.d/98systemd/dracut-pre-pivot.sh +++ b/modules.d/98systemd/dracut-pre-pivot.sh @@ -36,6 +36,4 @@ while ! udevadm settle --timeout=0; do diff --git a/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch b/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch index 9622557..369f874 100644 --- a/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch +++ b/SOURCES/0361-iscsi-iscsiroot.sh-better-put-variables-in-quotes.patch @@ -9,7 +9,7 @@ first rule for a bash programmer 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index ea1bead..ce8f547 100755 +index ea1bead7..ce8f5479 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -78,23 +78,23 @@ handle_netroot() diff --git a/SOURCES/0362-network-fix-carrier-detection.patch b/SOURCES/0362-network-fix-carrier-detection.patch index 62e6b7f..64fccea 100644 --- a/SOURCES/0362-network-fix-carrier-detection.patch +++ b/SOURCES/0362-network-fix-carrier-detection.patch @@ -18,7 +18,7 @@ checking for static configurations. 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 7c06cd8..3055198 100755 +index 7c06cd86..30551987 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -105,7 +105,7 @@ do_dhcp() { @@ -89,7 +89,7 @@ index 7c06cd8..3055198 100755 # netif isn't the top stack? Then we should exit here. diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 995d32f..07ea570 100755 +index 995d32f6..07ea5709 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -531,22 +531,20 @@ wait_for_if_up() { diff --git a/SOURCES/0363-dracut-functions.sh-fix-check_vol_slaves-volume-grou.patch b/SOURCES/0363-dracut-functions.sh-fix-check_vol_slaves-volume-grou.patch index a495877..4f49fef 100644 --- a/SOURCES/0363-dracut-functions.sh-fix-check_vol_slaves-volume-grou.patch +++ b/SOURCES/0363-dracut-functions.sh-fix-check_vol_slaves-volume-grou.patch @@ -13,7 +13,7 @@ stripping from lvm volume group names. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 9218779..d71ff67 100755 +index 9218779c..d71ff676 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -687,7 +687,7 @@ check_vol_slaves() { diff --git a/SOURCES/0364-multipath-fix-majmin_to_mpath_dev.patch b/SOURCES/0364-multipath-fix-majmin_to_mpath_dev.patch index f6367e7..c72996e 100644 --- a/SOURCES/0364-multipath-fix-majmin_to_mpath_dev.patch +++ b/SOURCES/0364-multipath-fix-majmin_to_mpath_dev.patch @@ -21,7 +21,7 @@ Subject: [PATCH] multipath: fix majmin_to_mpath_dev() 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh -index 4971d18..3983b7b 100755 +index 4971d18d..3983b7b7 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -11,9 +11,10 @@ is_mpath() { diff --git a/SOURCES/0365-90lvm-Install-dm-snapshot-module.patch b/SOURCES/0365-90lvm-Install-dm-snapshot-module.patch index 44f7667..dc14cfe 100644 --- a/SOURCES/0365-90lvm-Install-dm-snapshot-module.patch +++ b/SOURCES/0365-90lvm-Install-dm-snapshot-module.patch @@ -12,7 +12,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 4 insertions(+) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 90bc39f..5e374fb 100755 +index 90bc39f7..5e374fbc 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -42,6 +42,10 @@ cmdline() { diff --git a/SOURCES/0366-systemd-add-wheel-and-adm-to-passwd-and-group.patch b/SOURCES/0366-systemd-add-wheel-and-adm-to-passwd-and-group.patch index 1e72c31..99fe276 100644 --- a/SOURCES/0366-systemd-add-wheel-and-adm-to-passwd-and-group.patch +++ b/SOURCES/0366-systemd-add-wheel-and-adm-to-passwd-and-group.patch @@ -28,7 +28,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1287537 1 file changed, 17 insertions(+) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index a656fe0..647315f 100755 +index a656fe0f..647315f0 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -22,6 +22,17 @@ installkernel() { diff --git a/SOURCES/0367-dracut-add-tar-and-dd-requirement.patch b/SOURCES/0367-dracut-add-tar-and-dd-requirement.patch index 53c54dd..3fe32c4 100644 --- a/SOURCES/0367-dracut-add-tar-and-dd-requirement.patch +++ b/SOURCES/0367-dracut-add-tar-and-dd-requirement.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1285810 1 file changed, 1 insertion(+) diff --git a/dracut.spec b/dracut.spec -index ad737c2..c937909 100644 +index ad737c25..c9379093 100644 --- a/dracut.spec +++ b/dracut.spec @@ -91,6 +91,7 @@ Requires: gzip xz diff --git a/SOURCES/0368-dracut.sh-for-microcode-generation-skip-gpg-files.patch b/SOURCES/0368-dracut.sh-for-microcode-generation-skip-gpg-files.patch index 124e414..61bce9c 100644 --- a/SOURCES/0368-dracut.sh-for-microcode-generation-skip-gpg-files.patch +++ b/SOURCES/0368-dracut.sh-for-microcode-generation-skip-gpg-files.patch @@ -11,7 +11,7 @@ skip all ".asc" files for the AMD microcode generation 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh -index 5b72221..6bbde70 100755 +index 5b72221e..6bbde70b 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1497,7 +1497,12 @@ if [[ $early_microcode = yes ]]; then diff --git a/SOURCES/0369-documentation-hostonly-i18n-no-hostonly-i18n-i18n_in.patch b/SOURCES/0369-documentation-hostonly-i18n-no-hostonly-i18n-i18n_in.patch index cd4f00f..318fe11 100644 --- a/SOURCES/0369-documentation-hostonly-i18n-no-hostonly-i18n-i18n_in.patch +++ b/SOURCES/0369-documentation-hostonly-i18n-no-hostonly-i18n-i18n_in.patch @@ -11,7 +11,7 @@ Subject: [PATCH] documentation: "--hostonly-i18n" "--no-hostonly-i18n" 2 files changed, 9 insertions(+) diff --git a/dracut.8.asc b/dracut.8.asc -index 14ce26b..5f68d16 100644 +index 14ce26b6..5f68d16a 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -306,6 +306,12 @@ provide a valid _/etc/fstab_. @@ -28,7 +28,7 @@ index 14ce26b..5f68d16 100644 Use __ to address disks and partitions. __ can be any directory name found in /dev/disk. diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index be62da9..99f70ff 100644 +index be62da98..99f70fff 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -79,6 +79,9 @@ Configuration files must have the extension .conf; other extensions are ignored. diff --git a/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch b/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch index 37ace1a..32cc862 100644 --- a/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch +++ b/SOURCES/0370-network-dhclient-script.sh-add-classless-static-rout.patch @@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1260955 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 6d4b9dd..9553858 100755 +index 6d4b9dd1..95538585 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -95,6 +95,51 @@ setup_interface6() { @@ -77,7 +77,7 @@ index 6d4b9dd..9553858 100755 [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif" echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh" diff --git a/modules.d/40network/dhclient.conf b/modules.d/40network/dhclient.conf -index dbf5882..7b06763 100644 +index dbf58821..7b067632 100644 --- a/modules.d/40network/dhclient.conf +++ b/modules.d/40network/dhclient.conf @@ -1,3 +1,6 @@ diff --git a/SOURCES/0371-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch b/SOURCES/0371-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch index 263420e..dea5c19 100644 --- a/SOURCES/0371-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch +++ b/SOURCES/0371-network-if-rd.neednet-0-we-don-t-need-a-bootdev.patch @@ -12,7 +12,7 @@ setup 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 7c403f7..3c96204 100755 +index 7c403f79..3c962044 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -42,6 +42,8 @@ if [ -n "$NEEDBOOTDEV" ] && getargbool 1 rd.neednet; then diff --git a/SOURCES/0372-url-lib-url-lib.sh-nfs_fetch_url-pass-file-directory.patch b/SOURCES/0372-url-lib-url-lib.sh-nfs_fetch_url-pass-file-directory.patch index 8740a9e..45eaafc 100644 --- a/SOURCES/0372-url-lib-url-lib.sh-nfs_fetch_url-pass-file-directory.patch +++ b/SOURCES/0372-url-lib-url-lib.sh-nfs_fetch_url-pass-file-directory.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1302764 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh -index 12df9b4..f3d152d 100755 +index 12df9b4c..f3d152d6 100755 --- a/modules.d/45url-lib/url-lib.sh +++ b/modules.d/45url-lib/url-lib.sh @@ -106,7 +106,7 @@ nfs_fetch_url() { diff --git a/SOURCES/0373-95iscsi-Autodetect-iSCSI-firmware.patch b/SOURCES/0373-95iscsi-Autodetect-iSCSI-firmware.patch index 96df389..85f4296 100644 --- a/SOURCES/0373-95iscsi-Autodetect-iSCSI-firmware.patch +++ b/SOURCES/0373-95iscsi-Autodetect-iSCSI-firmware.patch @@ -33,7 +33,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 26 insertions(+) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 4ecba05..7ef0caa 100755 +index 4ecba05e..7ef0caa6 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -29,6 +29,21 @@ check() { diff --git a/SOURCES/0374-95iscsi-Install-libgcc_s-library.patch b/SOURCES/0374-95iscsi-Install-libgcc_s-library.patch index ccb5601..9305faa 100644 --- a/SOURCES/0374-95iscsi-Install-libgcc_s-library.patch +++ b/SOURCES/0374-95iscsi-Install-libgcc_s-library.patch @@ -16,7 +16,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 1 insertion(+) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 7ef0caa..422bea7 100755 +index 7ef0caa6..422bea72 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -104,6 +104,7 @@ cmdline() { diff --git a/SOURCES/0375-95iscsi-Fixup-bnx2i-offload-booting.patch b/SOURCES/0375-95iscsi-Fixup-bnx2i-offload-booting.patch index 6ee43d0..31721d8 100644 --- a/SOURCES/0375-95iscsi-Fixup-bnx2i-offload-booting.patch +++ b/SOURCES/0375-95iscsi-Fixup-bnx2i-offload-booting.patch @@ -22,7 +22,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 422bea7..181da3c 100755 +index 422bea72..181da3c7 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -29,14 +29,38 @@ check() { diff --git a/SOURCES/0376-95iscsi-More-empty-cmdline-fixes.patch b/SOURCES/0376-95iscsi-More-empty-cmdline-fixes.patch index b80f14b..3eb8a0b 100644 --- a/SOURCES/0376-95iscsi-More-empty-cmdline-fixes.patch +++ b/SOURCES/0376-95iscsi-More-empty-cmdline-fixes.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 181da3c..64c9c1d 100755 +index 181da3c7..64c9c1d1 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -75,12 +75,6 @@ depends() { diff --git a/SOURCES/0377-95iscsi-parse-output-from-iscsiadm-correctly.patch b/SOURCES/0377-95iscsi-parse-output-from-iscsiadm-correctly.patch index d4720da..823a803 100644 --- a/SOURCES/0377-95iscsi-parse-output-from-iscsiadm-correctly.patch +++ b/SOURCES/0377-95iscsi-parse-output-from-iscsiadm-correctly.patch @@ -16,7 +16,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh -index 64c9c1d..b1f5c6c 100755 +index 64c9c1d1..b1f5c6cb 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -31,15 +31,16 @@ check() { diff --git a/SOURCES/0378-shutdown-guard-against-read-only-run.patch b/SOURCES/0378-shutdown-guard-against-read-only-run.patch index 651ffdc..021120c 100644 --- a/SOURCES/0378-shutdown-guard-against-read-only-run.patch +++ b/SOURCES/0378-shutdown-guard-against-read-only-run.patch @@ -12,7 +12,7 @@ remount the switch rooted /run writeable again. 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules.d/99shutdown/module-setup.sh b/modules.d/99shutdown/module-setup.sh -index 5361936..bdb3373 100755 +index 5361936e..bdb33733 100755 --- a/modules.d/99shutdown/module-setup.sh +++ b/modules.d/99shutdown/module-setup.sh @@ -13,7 +13,7 @@ depends() { @@ -25,7 +25,7 @@ index 5361936..bdb3373 100755 inst "$moddir/shutdown.sh" "$prefix/shutdown" [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh -index 1daf2ca..bcb191b 100755 +index 1daf2ca3..bcb191bc 100755 --- a/modules.d/99shutdown/shutdown.sh +++ b/modules.d/99shutdown/shutdown.sh @@ -14,6 +14,10 @@ export TERM=linux diff --git a/SOURCES/0379-kernel-modules-increase-SDHCI-driver-inclusion.patch b/SOURCES/0379-kernel-modules-increase-SDHCI-driver-inclusion.patch index 13009d6..c5880a3 100644 --- a/SOURCES/0379-kernel-modules-increase-SDHCI-driver-inclusion.patch +++ b/SOURCES/0379-kernel-modules-increase-SDHCI-driver-inclusion.patch @@ -19,7 +19,7 @@ and sdhci-acpi. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 34d85b1..7d9d369 100755 +index 34d85b1c..7d9d369a 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -5,7 +5,7 @@ diff --git a/SOURCES/0380-dracut-functions.sh-add-str_starts-and-str_ends.patch b/SOURCES/0380-dracut-functions.sh-add-str_starts-and-str_ends.patch index 5ff43b5..4024e09 100644 --- a/SOURCES/0380-dracut-functions.sh-add-str_starts-and-str_ends.patch +++ b/SOURCES/0380-dracut-functions.sh-add-str_starts-and-str_ends.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut-functions.sh: add str_starts() and str_ends() 1 file changed, 4 insertions(+) diff --git a/dracut-functions.sh b/dracut-functions.sh -index d71ff67..4a9729c 100755 +index d71ff676..4a9729c7 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -29,6 +29,10 @@ fi diff --git a/SOURCES/0381-test-remove-dash-module-as-it-is-not-available-in-RH.patch b/SOURCES/0381-test-remove-dash-module-as-it-is-not-available-in-RH.patch index 6ccacba..aec0b31 100644 --- a/SOURCES/0381-test-remove-dash-module-as-it-is-not-available-in-RH.patch +++ b/SOURCES/0381-test-remove-dash-module-as-it-is-not-available-in-RH.patch @@ -16,7 +16,7 @@ Subject: [PATCH] test: remove dash module, as it is not available in RHEL 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh -index 642b250..aef0737 100755 +index 642b250e..aef07373 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -62,7 +62,7 @@ test_setup() { @@ -29,7 +29,7 @@ index 642b250..aef0737 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh -index e772352..363f8b0 100755 +index e772352a..363f8b04 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -89,7 +89,7 @@ test_setup() { @@ -42,7 +42,7 @@ index e772352..363f8b0 100755 --nomdadmconf \ --nohardlink \ diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh -index cf474df..45edda2 100755 +index cf474dff..45edda2c 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -60,7 +60,7 @@ test_setup() { @@ -55,7 +55,7 @@ index cf474df..45edda2 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh -index 11f66b2..e749ba0 100755 +index 11f66b23..e749ba0c 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -98,7 +98,7 @@ test_setup() { @@ -68,7 +68,7 @@ index 11f66b2..e749ba0 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh -index 9465965..a600e1c 100755 +index 9465965c..a600e1c0 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -86,7 +86,7 @@ test_setup() { @@ -81,7 +81,7 @@ index 9465965..a600e1c 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh -index 79e224e..dc6e588 100755 +index 79e224e2..dc6e5885 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -57,7 +57,7 @@ test_setup() { @@ -94,7 +94,7 @@ index 79e224e..dc6e588 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index fc4bdce..65457a5 100755 +index fc4bdce9..65457a5a 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -186,7 +186,7 @@ test_setup() { @@ -107,7 +107,7 @@ index fc4bdce..65457a5 100755 --no-hostonly-cmdline -N \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh -index abf1a4f..1a6524d 100755 +index abf1a4f4..1a6524de 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -226,7 +226,7 @@ make_encrypted_root() { @@ -129,7 +129,7 @@ index abf1a4f..1a6524d 100755 -f $TESTDIR/initramfs.server $KVERSION || return 1 diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index 4f73203..1c46d7a 100755 +index 4f73203f..1c46d7a8 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -264,7 +264,7 @@ test_setup() { diff --git a/SOURCES/0382-test-NBD-add-checks-for-needed-binaries.patch b/SOURCES/0382-test-NBD-add-checks-for-needed-binaries.patch index 7d2b10b..08fbbc5 100644 --- a/SOURCES/0382-test-NBD-add-checks-for-needed-binaries.patch +++ b/SOURCES/0382-test-NBD-add-checks-for-needed-binaries.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/NBD: add checks for needed binaries 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh -index 1a6524d..848a103 100755 +index 1a6524de..848a103f 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -95,7 +95,6 @@ client_test() { diff --git a/SOURCES/0383-dracut.spec-add-a-tag-with-the-current-version.patch b/SOURCES/0383-dracut.spec-add-a-tag-with-the-current-version.patch index ddaa2d5..68322c5 100644 --- a/SOURCES/0383-dracut.spec-add-a-tag-with-the-current-version.patch +++ b/SOURCES/0383-dracut.spec-add-a-tag-with-the-current-version.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.spec: add a tag with the current version 1 file changed, 1 insertion(+) diff --git a/dracut.spec b/dracut.spec -index c937909..5c4b047 100644 +index c9379093..5c4b0471 100644 --- a/dracut.spec +++ b/dracut.spec @@ -203,6 +203,7 @@ git commit -a -q -m "%{version} baseline." diff --git a/SOURCES/0384-more-dash-removal.patch b/SOURCES/0384-more-dash-removal.patch index bc60c99..5e1c633 100644 --- a/SOURCES/0384-more-dash-removal.patch +++ b/SOURCES/0384-more-dash-removal.patch @@ -14,7 +14,7 @@ Subject: [PATCH] more dash removal 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh -index 4ebff83..47268b0 100755 +index 4ebff837..47268b0e 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -58,7 +58,7 @@ test_setup() { @@ -27,7 +27,7 @@ index 4ebff83..47268b0 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh -index 3834238..01b406d 100755 +index 38342386..01b406d0 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -232,7 +232,7 @@ EOF @@ -49,7 +49,7 @@ index 3834238..01b406d 100755 -f $TESTDIR/initramfs.testing $KVERSION || return 1 diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh -index c3c27bc..dd1f8ea 100755 +index c3c27bce..dd1f8ead 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -57,7 +57,7 @@ test_setup() { @@ -62,7 +62,7 @@ index c3c27bc..dd1f8ea 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh -index 993f71d..7f75b32 100755 +index 993f71db..7f75b32d 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -94,7 +94,7 @@ test_setup() { @@ -75,7 +75,7 @@ index 993f71d..7f75b32 100755 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh -index 9b97136..c086677 100755 +index 9b971362..c086677f 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -58,7 +58,7 @@ test_setup() { @@ -88,7 +88,7 @@ index 9b97136..c086677 100755 --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh -index 14350e9..49dbc10 100755 +index 14350e98..49dbc10e 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -340,13 +340,13 @@ test_setup() { @@ -108,7 +108,7 @@ index 14350e9..49dbc10 100755 -d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \ -f $TESTDIR/initramfs.testing $KVERSION || return 1 diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index 65457a5..5e59f0a 100755 +index 65457a5a..5e59f0a8 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -217,7 +217,7 @@ test_setup() { diff --git a/SOURCES/0385-network-add-73-idrac.rules-udev-rules.patch b/SOURCES/0385-network-add-73-idrac.rules-udev-rules.patch index ee076e1..54944fc 100644 --- a/SOURCES/0385-network-add-73-idrac.rules-udev-rules.patch +++ b/SOURCES/0385-network-add-73-idrac.rules-udev-rules.patch @@ -9,7 +9,7 @@ idrac USB devices want a special network name 1 file changed, 3 insertions(+) diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 6cbbe8f..75ce622 100755 +index 6cbbe8f7..75ce6224 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -91,6 +91,9 @@ install() { diff --git a/SOURCES/0386-base-dracut-lib.sh-add-trim.patch b/SOURCES/0386-base-dracut-lib.sh-add-trim.patch index 393431e..e608040 100644 --- a/SOURCES/0386-base-dracut-lib.sh-add-trim.patch +++ b/SOURCES/0386-base-dracut-lib.sh-add-trim.patch @@ -9,7 +9,7 @@ trim() to remove leading and trailing whitespace 1 file changed, 7 insertions(+) diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index cb1ddd7..71dcedc 100755 +index cb1ddd76..71dcedcf 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -39,6 +39,13 @@ str_ends() { diff --git a/SOURCES/0387-network-net-genrules.sh-generate-rules-for-all-inter.patch b/SOURCES/0387-network-net-genrules.sh-generate-rules-for-all-inter.patch index c370392..8e4b5b6 100644 --- a/SOURCES/0387-network-net-genrules.sh-generate-rules-for-all-inter.patch +++ b/SOURCES/0387-network-net-genrules.sh-generate-rules-for-all-inter.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1282680 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 750a4d7..526dd5c 100755 +index 750a4d7f..526dd5cf 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -16,7 +16,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh diff --git a/SOURCES/0388-ifup-setup-bridge-bonding-and-teaming-only-once.patch b/SOURCES/0388-ifup-setup-bridge-bonding-and-teaming-only-once.patch index 11d08f1..f3f2ded 100644 --- a/SOURCES/0388-ifup-setup-bridge-bonding-and-teaming-only-once.patch +++ b/SOURCES/0388-ifup-setup-bridge-bonding-and-teaming-only-once.patch @@ -9,7 +9,7 @@ if those assembled interfaces use dhcp "$iface.up" is created too late 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 3055198..f681336 100755 +index 30551987..f681336e 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -204,9 +204,12 @@ fi diff --git a/SOURCES/0389-network-parse-bond.sh-handle-multiple-bond-interface.patch b/SOURCES/0389-network-parse-bond.sh-handle-multiple-bond-interface.patch index c68adcf..fa9aea0 100644 --- a/SOURCES/0389-network-parse-bond.sh-handle-multiple-bond-interface.patch +++ b/SOURCES/0389-network-parse-bond.sh-handle-multiple-bond-interface.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network/parse-bond.sh: handle multiple bond interfaces 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh -index 25c51b8..80b3b07 100755 +index 25c51b89..80b3b077 100755 --- a/modules.d/40network/parse-bond.sh +++ b/modules.d/40network/parse-bond.sh @@ -10,14 +10,6 @@ diff --git a/SOURCES/0390-TEST-50-MULTINIC-add-multiple-bond-tests.patch b/SOURCES/0390-TEST-50-MULTINIC-add-multiple-bond-tests.patch index 3124b1e..133a062 100644 --- a/SOURCES/0390-TEST-50-MULTINIC-add-multiple-bond-tests.patch +++ b/SOURCES/0390-TEST-50-MULTINIC-add-multiple-bond-tests.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-50-MULTINIC: add multiple bond tests 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index 1c46d7a..c0c3615 100755 +index 1c46d7a8..c0c3615f 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -58,7 +58,7 @@ client_test() { diff --git a/SOURCES/0391-network-dhclient.conf-add-missing-commata.patch b/SOURCES/0391-network-dhclient.conf-add-missing-commata.patch index aa7d53a..475ce71 100644 --- a/SOURCES/0391-network-dhclient.conf-add-missing-commata.patch +++ b/SOURCES/0391-network-dhclient.conf-add-missing-commata.patch @@ -11,7 +11,7 @@ options need to be seperated by , 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient.conf b/modules.d/40network/dhclient.conf -index 7b06763..a1739ce 100644 +index 7b067632..a1739ce3 100644 --- a/modules.d/40network/dhclient.conf +++ b/modules.d/40network/dhclient.conf @@ -3,4 +3,4 @@ option classless-routes code 121 = array of unsigned integer 8; diff --git a/SOURCES/0392-systemd-add-.slice-and-make-reboot-work.patch b/SOURCES/0392-systemd-add-.slice-and-make-reboot-work.patch index 578c874..416a582 100644 --- a/SOURCES/0392-systemd-add-.slice-and-make-reboot-work.patch +++ b/SOURCES/0392-systemd-add-.slice-and-make-reboot-work.patch @@ -20,7 +20,7 @@ makes reboot work 11 files changed, 21 insertions(+) diff --git a/modules.d/98systemd/dracut-cmdline-ask.service b/modules.d/98systemd/dracut-cmdline-ask.service -index 9993671..3d489a4 100644 +index 9993671c..3d489a4e 100644 --- a/modules.d/98systemd/dracut-cmdline-ask.service +++ b/modules.d/98systemd/dracut-cmdline-ask.service @@ -15,6 +15,8 @@ After=systemd-journald.socket @@ -33,7 +33,7 @@ index 9993671..3d489a4 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-cmdline.service b/modules.d/98systemd/dracut-cmdline.service -index f888bf4..7f0835b 100644 +index f888bf46..7f0835b4 100644 --- a/modules.d/98systemd/dracut-cmdline.service +++ b/modules.d/98systemd/dracut-cmdline.service @@ -20,6 +20,8 @@ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cmdline @@ -46,7 +46,7 @@ index f888bf4..7f0835b 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service -index 5a6d525..5c01411 100644 +index 5a6d5250..5c014110 100644 --- a/modules.d/98systemd/dracut-emergency.service +++ b/modules.d/98systemd/dracut-emergency.service @@ -14,6 +14,8 @@ After=systemd-vconsole-setup.service @@ -59,7 +59,7 @@ index 5a6d525..5c01411 100644 [Service] Environment=HOME=/ diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service -index 1b9e701..6340dd4 100644 +index 1b9e701b..6340dd4d 100644 --- a/modules.d/98systemd/dracut-initqueue.service +++ b/modules.d/98systemd/dracut-initqueue.service @@ -23,6 +23,8 @@ ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/finished/*.sh @@ -72,7 +72,7 @@ index 1b9e701..6340dd4 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-mount.service b/modules.d/98systemd/dracut-mount.service -index 20c633d..2e1e47b 100644 +index 20c633d0..2e1e47b9 100644 --- a/modules.d/98systemd/dracut-mount.service +++ b/modules.d/98systemd/dracut-mount.service @@ -15,6 +15,8 @@ After=dracut-initqueue.service dracut-pre-mount.service @@ -85,7 +85,7 @@ index 20c633d..2e1e47b 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-mount.service b/modules.d/98systemd/dracut-pre-mount.service -index d7be48d..ed67f9d 100644 +index d7be48d8..ed67f9df 100644 --- a/modules.d/98systemd/dracut-pre-mount.service +++ b/modules.d/98systemd/dracut-pre-mount.service @@ -17,6 +17,8 @@ After=cryptsetup.target @@ -98,7 +98,7 @@ index d7be48d..ed67f9d 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service -index f453900..1faeb78 100644 +index f4539006..1faeb78b 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -16,6 +16,8 @@ Before=initrd-cleanup.service @@ -111,7 +111,7 @@ index f453900..1faeb78 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-trigger.service b/modules.d/98systemd/dracut-pre-trigger.service -index 69b4cce..f198036 100644 +index 69b4cceb..f1980368 100644 --- a/modules.d/98systemd/dracut-pre-trigger.service +++ b/modules.d/98systemd/dracut-pre-trigger.service @@ -17,6 +17,8 @@ Wants=dracut-pre-udev.service systemd-udevd.service @@ -124,7 +124,7 @@ index 69b4cce..f198036 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-udev.service b/modules.d/98systemd/dracut-pre-udev.service -index d125b37..7fb3304 100644 +index d125b375..7fb33044 100644 --- a/modules.d/98systemd/dracut-pre-udev.service +++ b/modules.d/98systemd/dracut-pre-udev.service @@ -20,6 +20,8 @@ ConditionKernelCommandLine=|rd.break=pre-udev @@ -137,7 +137,7 @@ index d125b37..7fb3304 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/emergency.service b/modules.d/98systemd/emergency.service -index 5f1eaa2..5c2c1c7 100644 +index 5f1eaa23..5c2c1c70 100644 --- a/modules.d/98systemd/emergency.service +++ b/modules.d/98systemd/emergency.service @@ -13,6 +13,8 @@ DefaultDependencies=no @@ -150,7 +150,7 @@ index 5f1eaa2..5c2c1c7 100644 [Service] Environment=HOME=/ diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 647315f..64b83a0 100755 +index 647315f0..64b83a0e 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -137,6 +137,7 @@ install() { diff --git a/SOURCES/0393-test-TEST-02-systemd-use-marker-disk-for-successfull.patch b/SOURCES/0393-test-TEST-02-systemd-use-marker-disk-for-successfull.patch index 391984f..7441e42 100644 --- a/SOURCES/0393-test-TEST-02-systemd-use-marker-disk-for-successfull.patch +++ b/SOURCES/0393-test-TEST-02-systemd-use-marker-disk-for-successfull.patch @@ -10,7 +10,7 @@ Subject: [PATCH] test/TEST-02-systemd: use marker disk for successfull boot 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/TEST-02-SYSTEMD/test-init.sh b/test/TEST-02-SYSTEMD/test-init.sh -index ff17b6b..1c65e84 100755 +index ff17b6b4..1c65e844 100755 --- a/test/TEST-02-SYSTEMD/test-init.sh +++ b/test/TEST-02-SYSTEMD/test-init.sh @@ -4,7 +4,7 @@ strstr() { [ "${1#*$2*}" != "$1" ]; } @@ -23,7 +23,7 @@ index ff17b6b..1c65e84 100755 export PS1='initramfs-test:\w\$ ' [ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh -index 47268b0..6f33181 100755 +index 47268b0e..6f33181c 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -4,19 +4,23 @@ TEST_DESCRIPTION="root filesystem on a ext3 filesystem" diff --git a/SOURCES/0394-Disable-early-microcode-for-non-x86-architecures.patch b/SOURCES/0394-Disable-early-microcode-for-non-x86-architecures.patch index 85258c2..98bfe3f 100644 --- a/SOURCES/0394-Disable-early-microcode-for-non-x86-architecures.patch +++ b/SOURCES/0394-Disable-early-microcode-for-non-x86-architecures.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Disable early microcode for non-x86 architecures 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dracut.sh b/dracut.sh -index 6bbde70..b85d42d 100755 +index 6bbde70b..b85d42dd 100755 --- a/dracut.sh +++ b/dracut.sh @@ -819,13 +819,6 @@ readonly initdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)" diff --git a/SOURCES/0395-fcoe-check-if-needed-for-hostonly.patch b/SOURCES/0395-fcoe-check-if-needed-for-hostonly.patch index e22dd81..1c6d82c 100644 --- a/SOURCES/0395-fcoe-check-if-needed-for-hostonly.patch +++ b/SOURCES/0395-fcoe-check-if-needed-for-hostonly.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fcoe: check if needed for hostonly 2 files changed, 17 insertions(+) diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index f5277f4..242363e 100755 +index f5277f48..242363ef 100755 --- a/modules.d/95fcoe-uefi/module-setup.sh +++ b/modules.d/95fcoe-uefi/module-setup.sh @@ -4,6 +4,14 @@ @@ -28,7 +28,7 @@ index f5277f4..242363e 100755 [ -d /sys/firmware/efi ] || return 255 } diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index 646cfa8..ba10b0a 100755 +index 646cfa84..ba10b0ab 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -3,6 +3,15 @@ diff --git a/SOURCES/0396-dracut-only-use-one-tmpdir.patch b/SOURCES/0396-dracut-only-use-one-tmpdir.patch index 7962cf7..00c6dd2 100644 --- a/SOURCES/0396-dracut-only-use-one-tmpdir.patch +++ b/SOURCES/0396-dracut-only-use-one-tmpdir.patch @@ -10,7 +10,7 @@ also remove any partial written initramfs images 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/dracut-logger.sh b/dracut-logger.sh -index ffa5616..53f7462 100755 +index ffa56167..53f74625 100755 --- a/dracut-logger.sh +++ b/dracut-logger.sh @@ -150,8 +150,7 @@ dlog_init() { @@ -24,7 +24,7 @@ index ffa5616..53f7462 100755 readonly _dlogfd=15 systemd-cat -t 'dracut' --level-prefix=true <"$_systemdcatfile" & diff --git a/dracut.sh b/dracut.sh -index b85d42d..7897679 100755 +index b85d42dd..78976792 100755 --- a/dracut.sh +++ b/dracut.sh @@ -813,24 +813,25 @@ fi diff --git a/SOURCES/0397-add-install-optional-and-install_optional_items.patch b/SOURCES/0397-add-install-optional-and-install_optional_items.patch index daa70ab..04e936e 100644 --- a/SOURCES/0397-add-install-optional-and-install_optional_items.patch +++ b/SOURCES/0397-add-install-optional-and-install_optional_items.patch @@ -13,7 +13,7 @@ Subject: [PATCH] add "--install-optional" and install_optional_items 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh -index 9f359c6..feced60 100644 +index 9f359c6e..feced605 100644 --- a/dracut-bash-completion.sh +++ b/dracut-bash-completion.sh @@ -40,7 +40,7 @@ _dracut() { @@ -35,7 +35,7 @@ index 9f359c6..feced60 100644 compopt -o filenames ;; diff --git a/dracut.8.asc b/dracut.8.asc -index 5f68d16..8fd863b 100644 +index 5f68d16a..8fd863b9 100644 --- a/dracut.8.asc +++ b/dracut.8.asc @@ -355,6 +355,9 @@ example: @@ -49,7 +49,7 @@ index 5f68d16..8fd863b 100644 Compress the generated initramfs using gzip. This will be done by default, unless another compression option or --no-compress is passed. Equivalent to diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index 99f70ff..c20a341 100644 +index 99f70fff..c20a341d 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -66,6 +66,10 @@ Configuration files must have the extension .conf; other extensions are ignored. @@ -64,7 +64,7 @@ index 99f70ff..c20a341 100644 Strip binaries in the initramfs (default=yes) diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example -index ff4e3b2..d69c943 100644 +index ff4e3b27..d69c943b 100644 --- a/dracut.conf.d/fedora.conf.example +++ b/dracut.conf.d/fedora.conf.example @@ -6,7 +6,7 @@ i18n_default_font="latarcyrheb-sun16" @@ -77,7 +77,7 @@ index ff4e3b2..d69c943 100644 systemdutildir=/usr/lib/systemd systemdsystemunitdir=/usr/lib/systemd/system diff --git a/dracut.sh b/dracut.sh -index 7897679..fefdefd 100755 +index 78976792..fefdefd5 100755 --- a/dracut.sh +++ b/dracut.sh @@ -158,6 +158,8 @@ Creates initial ramdisk images for preloading modules diff --git a/SOURCES/0398-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch b/SOURCES/0398-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch index 3fab13f..c6b4723 100644 --- a/SOURCES/0398-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch +++ b/SOURCES/0398-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch @@ -18,7 +18,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh -index 7e8a416..270a9d3 100755 +index 7e8a416c..270a9d31 100755 --- a/modules.d/95nbd/module-setup.sh +++ b/modules.d/95nbd/module-setup.sh @@ -4,8 +4,6 @@ diff --git a/SOURCES/0399-Replace-echo-n-with-printf-in-code-with-a-bin-sh-she.patch b/SOURCES/0399-Replace-echo-n-with-printf-in-code-with-a-bin-sh-she.patch index a7c981b..9b48a6c 100644 --- a/SOURCES/0399-Replace-echo-n-with-printf-in-code-with-a-bin-sh-she.patch +++ b/SOURCES/0399-Replace-echo-n-with-printf-in-code-with-a-bin-sh-she.patch @@ -27,7 +27,7 @@ printf has more well-defined behavior. 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules.d/04watchdog/watchdog-stop.sh b/modules.d/04watchdog/watchdog-stop.sh -index 91d45d6..921f969 100755 +index 91d45d63..921f9695 100755 --- a/modules.d/04watchdog/watchdog-stop.sh +++ b/modules.d/04watchdog/watchdog-stop.sh @@ -1,2 +1,2 @@ @@ -35,7 +35,7 @@ index 91d45d6..921f969 100755 -[ -c /dev/watchdog ] && echo -n 'V' > /dev/watchdog +[ -c /dev/watchdog ] && printf 'V' > /dev/watchdog diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 07ea570..f91d169 100755 +index 07ea5709..f91d1691 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -211,7 +211,7 @@ set_ifname() { @@ -48,7 +48,7 @@ index 07ea570..f91d169 100755 # strip hardware type field from pxelinux [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:} diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index f3a1c10..a5114be 100755 +index f3a1c109..a5114be1 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -50,7 +50,7 @@ print_s390() { @@ -61,7 +61,7 @@ index f3a1c10..a5114be 100755 }) [ -n "$SUBCHANNELS" ] || return 1 diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh -index f87831c..ae6f177 100755 +index f87831c7..ae6f177b 100755 --- a/modules.d/90lvm/lvm_scan.sh +++ b/modules.d/90lvm/lvm_scan.sh @@ -17,14 +17,14 @@ SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=) @@ -82,7 +82,7 @@ index f87831c..ae6f177 100755 printf '"a|^/dev/%s$|", ' $dev; done; diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh -index de7dcc2..8026db3 100755 +index de7dcc22..8026db3c 100755 --- a/modules.d/98usrmount/mount-usr.sh +++ b/modules.d/98usrmount/mount-usr.sh @@ -14,7 +14,7 @@ filtersubvol() { @@ -95,7 +95,7 @@ index de7dcc2..8026db3 100755 shift done diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 71dcedc..c2b6108 100755 +index 71dcedcf..c2b6108a 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -295,7 +295,7 @@ _dogetargs() { @@ -119,7 +119,7 @@ index 71dcedc..c2b6108 100755 debug_on return 0 diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index dcc62d2..a07d0f9 100755 +index dcc62d2a..a07d0f94 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -253,8 +253,8 @@ while :; do @@ -134,7 +134,7 @@ index dcc62d2..a07d0f9 100755 # pre pivot scripts are sourced just before we doing cleanup and switch over diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh -index 5055413..be7a3a0 100755 +index 50554132..be7a3a00 100755 --- a/test/TEST-10-RAID/create-root.sh +++ b/test/TEST-10-RAID/create-root.sh @@ -18,7 +18,7 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /d @@ -147,7 +147,7 @@ index 5055413..be7a3a0 100755 echo "The passphrase is test" cryptsetup luksOpen /dev/md0 dracut_crypt_test /keyfile /sbin/cryptsetup luksOpen "$1" "$2" 1 file changed, 2 insertions(+) diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh -index 7eca0b6..745a78c 100755 +index 7eca0b6c..745a78c6 100755 --- a/modules.d/95fcoe/parse-fcoe.sh +++ b/modules.d/95fcoe/parse-fcoe.sh @@ -31,8 +31,10 @@ udevadm settle --timeout=30 diff --git a/SOURCES/0401-Defer-modprobe-of-HW-modules-until-udev-is-running.patch b/SOURCES/0401-Defer-modprobe-of-HW-modules-until-udev-is-running.patch index 61b5e7f..5ffc933 100644 --- a/SOURCES/0401-Defer-modprobe-of-HW-modules-until-udev-is-running.patch +++ b/SOURCES/0401-Defer-modprobe-of-HW-modules-until-udev-is-running.patch @@ -12,7 +12,7 @@ Also honor blacklisting 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh -index 745a78c..e8a77e0 100755 +index 745a78c6..e8a77e08 100755 --- a/modules.d/95fcoe/parse-fcoe.sh +++ b/modules.d/95fcoe/parse-fcoe.sh @@ -22,10 +22,9 @@ @@ -29,7 +29,7 @@ index 745a78c..e8a77e0 100755 # FCoE actually supported? [ -e /sys/bus/fcoe/ctlr_create ] || modprobe fcoe || die "FCoE requested but kernel/initrd does not support FCoE" diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 3d74ff2..80201d4 100755 +index 3d74ff2e..80201d4e 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -89,16 +89,11 @@ if [ -z "$netroot" ] || ! [ "${netroot%%:*}" = "iscsi" ]; then diff --git a/SOURCES/0402-95fcoe-start-lldpad-separately.patch b/SOURCES/0402-95fcoe-start-lldpad-separately.patch index 98bbf0b..a12989f 100644 --- a/SOURCES/0402-95fcoe-start-lldpad-separately.patch +++ b/SOURCES/0402-95fcoe-start-lldpad-separately.patch @@ -18,7 +18,7 @@ Signed-off-by: Thomas Renninger create mode 100644 modules.d/95fcoe/lldpad.sh diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index 823d7ac..1d62570 100755 +index 823d7acc..1d62570e 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -43,10 +43,6 @@ write_fcoemon_cfg() { @@ -45,7 +45,7 @@ index 823d7ac..1d62570 100755 info "Retrying to turn dcb on" diff --git a/modules.d/95fcoe/lldpad.sh b/modules.d/95fcoe/lldpad.sh new file mode 100644 -index 0000000..d06a3bd +index 00000000..d06a3bd8 --- /dev/null +++ b/modules.d/95fcoe/lldpad.sh @@ -0,0 +1,14 @@ @@ -64,7 +64,7 @@ index 0000000..d06a3bd + i=$(($i+1)) +done diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index ba10b0a..c000b3b 100755 +index ba10b0ab..c000b3be 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -36,6 +36,7 @@ install() { diff --git a/SOURCES/0403-95fcoe-skip-VLAN-devices-in-fcoe-up.patch b/SOURCES/0403-95fcoe-skip-VLAN-devices-in-fcoe-up.patch index 25a4d96..c9bf58f 100644 --- a/SOURCES/0403-95fcoe-skip-VLAN-devices-in-fcoe-up.patch +++ b/SOURCES/0403-95fcoe-skip-VLAN-devices-in-fcoe-up.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 8 insertions(+) diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index 1d62570..0399aff 100755 +index 1d62570e..0399affd 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -22,6 +22,14 @@ netif=$1 diff --git a/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch b/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch index 35b170b..fd3e9f7 100644 --- a/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch +++ b/SOURCES/0404-95fcoe-Store-current-configuration-in-dracut-cmdline.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 45 insertions(+) diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index c000b3b..af2798d 100755 +index c000b3be..af2798dc 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -13,6 +13,7 @@ check() { diff --git a/SOURCES/0405-95fcoe-update-fcoe-interface-check.patch b/SOURCES/0405-95fcoe-update-fcoe-interface-check.patch index 706dca1..0f629f7 100644 --- a/SOURCES/0405-95fcoe-update-fcoe-interface-check.patch +++ b/SOURCES/0405-95fcoe-update-fcoe-interface-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] 95fcoe: update fcoe interface check 1 file changed, 3 deletions(-) diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh -index e8a77e0..3d82912 100755 +index e8a77e08..3d829122 100755 --- a/modules.d/95fcoe/parse-fcoe.sh +++ b/modules.d/95fcoe/parse-fcoe.sh @@ -26,9 +26,6 @@ diff --git a/SOURCES/0406-fcoe-up-remove-initlog-logic.patch b/SOURCES/0406-fcoe-up-remove-initlog-logic.patch index dd01474..50a2a1f 100644 --- a/SOURCES/0406-fcoe-up-remove-initlog-logic.patch +++ b/SOURCES/0406-fcoe-up-remove-initlog-logic.patch @@ -9,7 +9,7 @@ Subject: [PATCH] fcoe-up: remove initlog logic 1 file changed, 2 deletions(-) diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh -index 0399aff..cdff6ef 100755 +index 0399affd..cdff6ef1 100755 --- a/modules.d/95fcoe/fcoe-up.sh +++ b/modules.d/95fcoe/fcoe-up.sh @@ -13,8 +13,6 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin diff --git a/SOURCES/0407-network-net-lib.sh-correctly-set-mac-address-for-ip-.patch b/SOURCES/0407-network-net-lib.sh-correctly-set-mac-address-for-ip-.patch index cad46c3..5272dcf 100644 --- a/SOURCES/0407-network-net-lib.sh-correctly-set-mac-address-for-ip-.patch +++ b/SOURCES/0407-network-net-lib.sh-correctly-set-mac-address-for-ip-.patch @@ -12,7 +12,7 @@ if ip=...:: was specified, macadress was not set 1 file changed, 3 insertions(+) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index f91d169..5a07b4e 100755 +index f91d1691..5a07b4ee 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -421,6 +421,9 @@ ip_to_var() { diff --git a/SOURCES/0408-network-support-macaddr-in-brackets.patch b/SOURCES/0408-network-support-macaddr-in-brackets.patch index d431182..79495d7 100644 --- a/SOURCES/0408-network-support-macaddr-in-brackets.patch +++ b/SOURCES/0408-network-support-macaddr-in-brackets.patch @@ -25,7 +25,7 @@ ip=::::test:ens3:dhcp:1000:[54:52:00:ab:cd:ef] 1 file changed, 75 insertions(+), 44 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 5a07b4e..0c00f92 100755 +index 5a07b4ee..0c00f925 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -406,53 +406,84 @@ ip_to_var() { diff --git a/SOURCES/0409-test-don-t-call-ldconfig-with-path-separator.patch b/SOURCES/0409-test-don-t-call-ldconfig-with-path-separator.patch index 9d19376..02a9d53 100644 --- a/SOURCES/0409-test-don-t-call-ldconfig-with-path-separator.patch +++ b/SOURCES/0409-test-don-t-call-ldconfig-with-path-separator.patch @@ -9,7 +9,7 @@ Subject: [PATCH] test: don't call ldconfig with -- path separator 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh -index c08a2a4..9d584e3 100755 +index c08a2a41..9d584e39 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -69,7 +69,7 @@ test_setup() { @@ -22,7 +22,7 @@ index c08a2a4..9d584e3 100755 python create.py -d -c livecd-fedora-minimal.ks return 0 diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index c0c3615..05273be 100755 +index c0c3615f..05273be7 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -222,7 +222,7 @@ test_setup() { diff --git a/SOURCES/0410-network-set-MTU-and-MACADDR-for-dhcp-and-auto6.patch b/SOURCES/0410-network-set-MTU-and-MACADDR-for-dhcp-and-auto6.patch index 4161d5e..162ec81 100644 --- a/SOURCES/0410-network-set-MTU-and-MACADDR-for-dhcp-and-auto6.patch +++ b/SOURCES/0410-network-set-MTU-and-MACADDR-for-dhcp-and-auto6.patch @@ -9,7 +9,7 @@ Subject: [PATCH] network: set MTU and MACADDR for dhcp and auto6 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index f681336..37f51b9 100755 +index f681336e..37f51b9d 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -110,6 +110,9 @@ do_dhcp() { @@ -41,7 +41,7 @@ index f681336..37f51b9 100755 done > /tmp/net.$netif.override diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index a5114be..cab7477 100755 +index a5114be1..cab74772 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -144,6 +144,7 @@ for netup in /tmp/net.*.did-setup ; do diff --git a/SOURCES/0411-test-add-TEST-60-MTUMAC.patch b/SOURCES/0411-test-add-TEST-60-MTUMAC.patch index bddd2a3..0deeabb 100644 --- a/SOURCES/0411-test-add-TEST-60-MTUMAC.patch +++ b/SOURCES/0411-test-add-TEST-60-MTUMAC.patch @@ -29,7 +29,7 @@ test MTU and MACADDR setting diff --git a/test/TEST-60-MTUMAC/99-idesymlinks.rules b/test/TEST-60-MTUMAC/99-idesymlinks.rules new file mode 100644 -index 0000000..d557790 +index 00000000..d557790a --- /dev/null +++ b/test/TEST-60-MTUMAC/99-idesymlinks.rules @@ -0,0 +1,8 @@ @@ -43,7 +43,7 @@ index 0000000..d557790 +ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdd*", SYMLINK+="sdd$env{MINOR}" diff --git a/test/TEST-60-MTUMAC/Makefile b/test/TEST-60-MTUMAC/Makefile new file mode 100644 -index 0000000..aad2705 +index 00000000..aad27059 --- /dev/null +++ b/test/TEST-60-MTUMAC/Makefile @@ -0,0 +1,10 @@ @@ -59,7 +59,7 @@ index 0000000..aad2705 + @basedir=../.. testdir=../ ./test.sh --run diff --git a/test/TEST-60-MTUMAC/client-init.sh b/test/TEST-60-MTUMAC/client-init.sh new file mode 100755 -index 0000000..a45c312 +index 00000000..a45c3123 --- /dev/null +++ b/test/TEST-60-MTUMAC/client-init.sh @@ -0,0 +1,22 @@ @@ -87,7 +87,7 @@ index 0000000..a45c312 +poweroff -f diff --git a/test/TEST-60-MTUMAC/dhcpd.conf b/test/TEST-60-MTUMAC/dhcpd.conf new file mode 100644 -index 0000000..cba2823 +index 00000000..cba28233 --- /dev/null +++ b/test/TEST-60-MTUMAC/dhcpd.conf @@ -0,0 +1,15 @@ @@ -108,14 +108,14 @@ index 0000000..cba2823 +} diff --git a/test/TEST-60-MTUMAC/exports b/test/TEST-60-MTUMAC/exports new file mode 100644 -index 0000000..ff5f29b +index 00000000..ff5f29b1 --- /dev/null +++ b/test/TEST-60-MTUMAC/exports @@ -0,0 +1 @@ +/nfs/client 192.168.50.0/24(rw,insecure,no_subtree_check,no_root_squash) diff --git a/test/TEST-60-MTUMAC/finished-false.sh b/test/TEST-60-MTUMAC/finished-false.sh new file mode 100755 -index 0000000..ecdbef9 +index 00000000..ecdbef95 --- /dev/null +++ b/test/TEST-60-MTUMAC/finished-false.sh @@ -0,0 +1,2 @@ @@ -123,7 +123,7 @@ index 0000000..ecdbef9 +exit 1 diff --git a/test/TEST-60-MTUMAC/hard-off.sh b/test/TEST-60-MTUMAC/hard-off.sh new file mode 100755 -index 0000000..12c3d5a +index 00000000..12c3d5ac --- /dev/null +++ b/test/TEST-60-MTUMAC/hard-off.sh @@ -0,0 +1,3 @@ @@ -132,7 +132,7 @@ index 0000000..12c3d5a +getarg failme && poweroff -f diff --git a/test/TEST-60-MTUMAC/hosts b/test/TEST-60-MTUMAC/hosts new file mode 100644 -index 0000000..d02a4e9 +index 00000000..d02a4e9b --- /dev/null +++ b/test/TEST-60-MTUMAC/hosts @@ -0,0 +1,5 @@ @@ -143,7 +143,7 @@ index 0000000..d02a4e9 +192.168.50.102 client-if3 diff --git a/test/TEST-60-MTUMAC/server-init.sh b/test/TEST-60-MTUMAC/server-init.sh new file mode 100755 -index 0000000..88ef212 +index 00000000..88ef2128 --- /dev/null +++ b/test/TEST-60-MTUMAC/server-init.sh @@ -0,0 +1,98 @@ @@ -247,7 +247,7 @@ index 0000000..88ef212 +poweroff -f diff --git a/test/TEST-60-MTUMAC/test.sh b/test/TEST-60-MTUMAC/test.sh new file mode 100755 -index 0000000..7633ac1 +index 00000000..7633ac13 --- /dev/null +++ b/test/TEST-60-MTUMAC/test.sh @@ -0,0 +1,282 @@ diff --git a/SOURCES/0412-network-net-lib.sh-parse_ifname_opts-support-21-byte.patch b/SOURCES/0412-network-net-lib.sh-parse_ifname_opts-support-21-byte.patch index f0d2dcc..689d36f 100644 --- a/SOURCES/0412-network-net-lib.sh-parse_ifname_opts-support-21-byte.patch +++ b/SOURCES/0412-network-net-lib.sh-parse_ifname_opts-support-21-byte.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1319270 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 0c00f92..9f76714 100755 +index 0c00f925..9f767144 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -523,8 +523,13 @@ parse_ifname_opts() { diff --git a/SOURCES/0413-network-net-lib.sh-wait_for_ipv6_dad-simplify-ip-cal.patch b/SOURCES/0413-network-net-lib.sh-wait_for_ipv6_dad-simplify-ip-cal.patch index beec079..85aa89c 100644 --- a/SOURCES/0413-network-net-lib.sh-wait_for_ipv6_dad-simplify-ip-cal.patch +++ b/SOURCES/0413-network-net-lib.sh-wait_for_ipv6_dad-simplify-ip-cal.patch @@ -9,7 +9,7 @@ taken from initscripts 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 9f76714..92154cc 100755 +index 9f767144..92154cc6 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -624,16 +624,12 @@ wait_for_ipv6_dad() { diff --git a/SOURCES/0414-systemd-ensure-journal-is-volatile.patch b/SOURCES/0414-systemd-ensure-journal-is-volatile.patch index 37df7fe..e792e42 100644 --- a/SOURCES/0414-systemd-ensure-journal-is-volatile.patch +++ b/SOURCES/0414-systemd-ensure-journal-is-volatile.patch @@ -15,7 +15,7 @@ switching root. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index 64b83a0..10beadd 100755 +index 64b83a0e..10beadda 100755 --- a/modules.d/98systemd/module-setup.sh +++ b/modules.d/98systemd/module-setup.sh @@ -255,9 +255,10 @@ install() { diff --git a/SOURCES/0415-network-dhcp-before-parsing-specified-dns-through-cm.patch b/SOURCES/0415-network-dhcp-before-parsing-specified-dns-through-cm.patch index 628c9f0..dd12cca 100644 --- a/SOURCES/0415-network-dhcp-before-parsing-specified-dns-through-cm.patch +++ b/SOURCES/0415-network-dhcp-before-parsing-specified-dns-through-cm.patch @@ -25,7 +25,7 @@ cherry-pick of commit cf376023e6d0d4abd9816fa954bb917fc2557713 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 37f51b9..19b7bbd 100755 +index 37f51b9d..19b7bbdc 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -350,16 +350,15 @@ fi diff --git a/SOURCES/0416-network-net-lib.sh-delete-duplicated-DNS-items-from-.patch b/SOURCES/0416-network-net-lib.sh-delete-duplicated-DNS-items-from-.patch index 01f469a..5478956 100644 --- a/SOURCES/0416-network-net-lib.sh-delete-duplicated-DNS-items-from-.patch +++ b/SOURCES/0416-network-net-lib.sh-delete-duplicated-DNS-items-from-.patch @@ -20,7 +20,7 @@ Signed-off-by: Xunlei Pang 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 75ce622..de35367 100755 +index 75ce6224..de353674 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -69,7 +69,7 @@ installkernel() { @@ -33,7 +33,7 @@ index 75ce622..de35367 100755 inst_multiple -o brctl inst_multiple -o teamd teamdctl teamnl diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 92154cc..e6942a5 100755 +index 92154cc6..e6942a55 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -121,7 +121,7 @@ setup_net() { diff --git a/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch b/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch index b06aa41..867f0fd 100644 --- a/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch +++ b/SOURCES/0417-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch @@ -16,7 +16,7 @@ Signed-off-by: Thomas Renninger 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index e6942a5..98dbbb6 100755 +index e6942a55..98dbbb63 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -235,22 +235,52 @@ ibft_to_cmdline() { diff --git a/SOURCES/0418-network-net-lib.sh-auto6-wait-for-route-ra.patch b/SOURCES/0418-network-net-lib.sh-auto6-wait-for-route-ra.patch index 4aafe6c..ff8b39c 100644 --- a/SOURCES/0418-network-net-lib.sh-auto6-wait-for-route-ra.patch +++ b/SOURCES/0418-network-net-lib.sh-auto6-wait-for-route-ra.patch @@ -9,7 +9,7 @@ Wait for a router advertised route 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 98dbbb6..b248133 100755 +index 98dbbb63..b248133d 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -659,7 +659,9 @@ wait_for_ipv6_auto() { diff --git a/SOURCES/0419-network-differ-between-ipv6-local-and-global-tentati.patch b/SOURCES/0419-network-differ-between-ipv6-local-and-global-tentati.patch index 77c9d1f..a70938d 100644 --- a/SOURCES/0419-network-differ-between-ipv6-local-and-global-tentati.patch +++ b/SOURCES/0419-network-differ-between-ipv6-local-and-global-tentati.patch @@ -10,7 +10,7 @@ For dhcpv6, only a non-tentative scope local address is needed. 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index 9553858..f6c77f2 100755 +index 95538585..f6c77f2f 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -149,7 +149,7 @@ case $reason in @@ -23,7 +23,7 @@ index 9553858..f6c77f2 100755 BOUND) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index b248133..986c673 100755 +index b248133d..986c673c 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -636,16 +636,34 @@ wait_for_route_ok() { diff --git a/SOURCES/0420-network-flush-only-IPv4-addresses-on-configuration.patch b/SOURCES/0420-network-flush-only-IPv4-addresses-on-configuration.patch index da2f01a..25b8cce 100644 --- a/SOURCES/0420-network-flush-only-IPv4-addresses-on-configuration.patch +++ b/SOURCES/0420-network-flush-only-IPv4-addresses-on-configuration.patch @@ -9,7 +9,7 @@ also flush on dhcp 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 19b7bbd..cedf9a7 100755 +index 19b7bbdc..cedf9a77 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -112,6 +112,7 @@ do_dhcp() { diff --git a/SOURCES/0421-network-wait_for_ipv6_auto-wait-for-all-tentative-ad.patch b/SOURCES/0421-network-wait_for_ipv6_auto-wait-for-all-tentative-ad.patch index a227fb6..5375739 100644 --- a/SOURCES/0421-network-wait_for_ipv6_auto-wait-for-all-tentative-ad.patch +++ b/SOURCES/0421-network-wait_for_ipv6_auto-wait-for-all-tentative-ad.patch @@ -8,7 +8,7 @@ Subject: [PATCH] network:wait_for_ipv6_auto() wait for all tentative addresses 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 986c673..7120193 100755 +index 986c673c..71201938 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -677,7 +677,7 @@ wait_for_ipv6_auto() { diff --git a/SOURCES/0422-dracut-systemd-dracut-cmdline.sh-Don-t-error-out-if-.patch b/SOURCES/0422-dracut-systemd-dracut-cmdline.sh-Don-t-error-out-if-.patch index fcb3926..d91087f 100644 --- a/SOURCES/0422-dracut-systemd-dracut-cmdline.sh-Don-t-error-out-if-.patch +++ b/SOURCES/0422-dracut-systemd-dracut-cmdline.sh-Don-t-error-out-if-.patch @@ -23,7 +23,7 @@ magic. 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index 9d15663..d22e4d6 100755 +index 9d15663e..d22e4d6e 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -22,7 +22,12 @@ getargbool 0 rd.udev.log-priority=debug -d rd.udev.debug -d -n -y rdudevdebug && diff --git a/SOURCES/0423-virtfs-use-systemd-generator.patch b/SOURCES/0423-virtfs-use-systemd-generator.patch index d161240..2e22f7a 100644 --- a/SOURCES/0423-virtfs-use-systemd-generator.patch +++ b/SOURCES/0423-virtfs-use-systemd-generator.patch @@ -12,7 +12,7 @@ use a systemd generator, instead of a dracut hook to mount create mode 100755 modules.d/95virtfs/virtfs-generator.sh diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh -index 12bd354..3d80b75 100755 +index 12bd354b..3d80b75f 100755 --- a/modules.d/95virtfs/module-setup.sh +++ b/modules.d/95virtfs/module-setup.sh @@ -37,5 +37,10 @@ installkernel() { @@ -28,7 +28,7 @@ index 12bd354..3d80b75 100755 + fi } diff --git a/modules.d/95virtfs/parse-virtfs.sh b/modules.d/95virtfs/parse-virtfs.sh -index ce6de6d..a9ad48a 100755 +index ce6de6d4..a9ad48a9 100755 --- a/modules.d/95virtfs/parse-virtfs.sh +++ b/modules.d/95virtfs/parse-virtfs.sh @@ -3,7 +3,7 @@ @@ -42,7 +42,7 @@ index ce6de6d..a9ad48a 100755 fi diff --git a/modules.d/95virtfs/virtfs-generator.sh b/modules.d/95virtfs/virtfs-generator.sh new file mode 100755 -index 0000000..3bdddf1 +index 00000000..3bdddf11 --- /dev/null +++ b/modules.d/95virtfs/virtfs-generator.sh @@ -0,0 +1,39 @@ diff --git a/SOURCES/0424-add-rd.device.timeout-seconds-parameter.patch b/SOURCES/0424-add-rd.device.timeout-seconds-parameter.patch index 9d22d06..c464b5f 100644 --- a/SOURCES/0424-add-rd.device.timeout-seconds-parameter.patch +++ b/SOURCES/0424-add-rd.device.timeout-seconds-parameter.patch @@ -9,7 +9,7 @@ Subject: [PATCH] add rd.device.timeout= parameter 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules.d/98systemd/rootfs-generator.sh b/modules.d/98systemd/rootfs-generator.sh -index 2c09895..a7bffdf 100755 +index 2c098951..a7bffdfd 100755 --- a/modules.d/98systemd/rootfs-generator.sh +++ b/modules.d/98systemd/rootfs-generator.sh @@ -7,6 +7,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh @@ -34,7 +34,7 @@ index 2c09895..a7bffdf 100755 fi } diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index c2b6108..16bc74d 100755 +index c2b6108a..16bc74d4 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -887,6 +887,7 @@ wait_for_dev() diff --git a/SOURCES/0425-test-TEST-04-systemd-fixup-test.patch b/SOURCES/0425-test-TEST-04-systemd-fixup-test.patch index 8190034..a19b0d0 100644 --- a/SOURCES/0425-test-TEST-04-systemd-fixup-test.patch +++ b/SOURCES/0425-test-TEST-04-systemd-fixup-test.patch @@ -12,7 +12,7 @@ Subject: [PATCH] test/TEST-04-systemd: fixup test 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh -index dcda926..288ae48 100755 +index dcda926a..288ae487 100755 --- a/test/TEST-04-FULL-SYSTEMD/test-init.sh +++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh @@ -19,7 +19,7 @@ if ismounted /usr && [ ! -s /failed ]; then @@ -25,7 +25,7 @@ index dcda926..288ae48 100755 if [ -s /failed ]; then echo "**************************FAILED**************************" diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh -index 01b406d..93c3389 100755 +index 01b406d0..93c33890 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -22,7 +22,7 @@ client_run() { diff --git a/SOURCES/0426-test-TEST-12-RAID-DEG-add-rd.device.timeout.patch b/SOURCES/0426-test-TEST-12-RAID-DEG-add-rd.device.timeout.patch index 96da81a..6582917 100644 --- a/SOURCES/0426-test-TEST-12-RAID-DEG-add-rd.device.timeout.patch +++ b/SOURCES/0426-test-TEST-12-RAID-DEG-add-rd.device.timeout.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/TEST-12-RAID-DEG: add rd.device.timeout 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh -index e749ba0..5f9cfc5 100755 +index e749ba0c..5f9cfc56 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -36,19 +36,19 @@ test_run() { diff --git a/SOURCES/0427-99base-init.sh-break-the-initqueue-if-emergency-shel.patch b/SOURCES/0427-99base-init.sh-break-the-initqueue-if-emergency-shel.patch index 7db8106..760520d 100644 --- a/SOURCES/0427-99base-init.sh-break-the-initqueue-if-emergency-shel.patch +++ b/SOURCES/0427-99base-init.sh-break-the-initqueue-if-emergency-shel.patch @@ -9,7 +9,7 @@ Subject: [PATCH] 99base/init.sh: break the initqueue, if emergency shell was 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index a07d0f9..7bbe670 100755 +index a07d0f94..7bbe6703 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -214,7 +214,8 @@ while :; do diff --git a/SOURCES/0428-systemd-dracut-initqueue.sh-don-t-go-into-emergency.patch b/SOURCES/0428-systemd-dracut-initqueue.sh-don-t-go-into-emergency.patch index c7abc92..0eef9a9 100644 --- a/SOURCES/0428-systemd-dracut-initqueue.sh-don-t-go-into-emergency.patch +++ b/SOURCES/0428-systemd-dracut-initqueue.sh-don-t-go-into-emergency.patch @@ -9,7 +9,7 @@ let systemd go into emergency.target later on 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh -index 5822556..c12531e 100755 +index 5822556b..c12531e2 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -68,11 +68,7 @@ while :; do diff --git a/SOURCES/0429-systemd-let-booting-work-after-exiting-emergency.patch b/SOURCES/0429-systemd-let-booting-work-after-exiting-emergency.patch index bd5ed40..a452f82 100644 --- a/SOURCES/0429-systemd-let-booting-work-after-exiting-emergency.patch +++ b/SOURCES/0429-systemd-let-booting-work-after-exiting-emergency.patch @@ -18,7 +18,7 @@ If the user managed to mount /sysroot, let it work 10 files changed, 3 insertions(+), 14 deletions(-) diff --git a/modules.d/98systemd/dracut-cmdline-ask.service b/modules.d/98systemd/dracut-cmdline-ask.service -index 3d489a4..f9dd379 100644 +index 3d489a4e..f9dd3790 100644 --- a/modules.d/98systemd/dracut-cmdline-ask.service +++ b/modules.d/98systemd/dracut-cmdline-ask.service @@ -16,7 +16,6 @@ Wants=systemd-journald.socket @@ -30,7 +30,7 @@ index 3d489a4..f9dd379 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-cmdline.service b/modules.d/98systemd/dracut-cmdline.service -index 7f0835b..e4797ca 100644 +index 7f0835b4..e4797ca3 100644 --- a/modules.d/98systemd/dracut-cmdline.service +++ b/modules.d/98systemd/dracut-cmdline.service @@ -21,7 +21,6 @@ ConditionKernelCommandLine=|rd.break=cmdline @@ -42,7 +42,7 @@ index 7f0835b..e4797ca 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service -index 5c01411..183f3af 100644 +index 5c014110..183f3af5 100644 --- a/modules.d/98systemd/dracut-emergency.service +++ b/modules.d/98systemd/dracut-emergency.service @@ -12,10 +12,8 @@ Description=Dracut Emergency Shell @@ -57,7 +57,7 @@ index 5c01411..183f3af 100644 [Service] Environment=HOME=/ diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service -index 6340dd4..46d041e 100644 +index 6340dd4d..46d041e8 100644 --- a/modules.d/98systemd/dracut-initqueue.service +++ b/modules.d/98systemd/dracut-initqueue.service @@ -24,7 +24,6 @@ ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/online/*.sh @@ -69,7 +69,7 @@ index 6340dd4..46d041e 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-mount.service b/modules.d/98systemd/dracut-mount.service -index 2e1e47b..e8e33fb 100644 +index 2e1e47b9..e8e33fbb 100644 --- a/modules.d/98systemd/dracut-mount.service +++ b/modules.d/98systemd/dracut-mount.service @@ -16,7 +16,6 @@ ConditionPathExists=/etc/initrd-release @@ -81,7 +81,7 @@ index 2e1e47b..e8e33fb 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-mount.service b/modules.d/98systemd/dracut-pre-mount.service -index ed67f9d..48c9b40 100644 +index ed67f9df..48c9b400 100644 --- a/modules.d/98systemd/dracut-pre-mount.service +++ b/modules.d/98systemd/dracut-pre-mount.service @@ -18,7 +18,6 @@ ConditionPathExists=/etc/initrd-release @@ -93,7 +93,7 @@ index ed67f9d..48c9b40 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service -index 1faeb78..ae1f155 100644 +index 1faeb78b..ae1f155d 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -17,7 +17,6 @@ Wants=remote-fs.target @@ -105,7 +105,7 @@ index 1faeb78..ae1f155 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-trigger.service b/modules.d/98systemd/dracut-pre-trigger.service -index f198036..5657450 100644 +index f1980368..5657450e 100644 --- a/modules.d/98systemd/dracut-pre-trigger.service +++ b/modules.d/98systemd/dracut-pre-trigger.service @@ -18,7 +18,6 @@ ConditionPathExists=/etc/initrd-release @@ -117,7 +117,7 @@ index f198036..5657450 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/dracut-pre-udev.service b/modules.d/98systemd/dracut-pre-udev.service -index 7fb3304..a554eb7 100644 +index 7fb33044..a554eb79 100644 --- a/modules.d/98systemd/dracut-pre-udev.service +++ b/modules.d/98systemd/dracut-pre-udev.service @@ -21,7 +21,6 @@ ConditionKernelCommandLine=|rd.driver.blacklist @@ -129,7 +129,7 @@ index 7fb3304..a554eb7 100644 [Service] Environment=DRACUT_SYSTEMD=1 diff --git a/modules.d/98systemd/emergency.service b/modules.d/98systemd/emergency.service -index 5c2c1c7..5da3aa3 100644 +index 5c2c1c70..5da3aa31 100644 --- a/modules.d/98systemd/emergency.service +++ b/modules.d/98systemd/emergency.service @@ -14,21 +14,20 @@ After=systemd-vconsole-setup.service diff --git a/SOURCES/0430-TEST-13-ENC-RAID-LVM-add-rd.device.timeout-40.patch b/SOURCES/0430-TEST-13-ENC-RAID-LVM-add-rd.device.timeout-40.patch index 9219bdf..1239e11 100644 --- a/SOURCES/0430-TEST-13-ENC-RAID-LVM-add-rd.device.timeout-40.patch +++ b/SOURCES/0430-TEST-13-ENC-RAID-LVM-add-rd.device.timeout-40.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-13-ENC-RAID-LVM: add rd.device.timeout=40 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh -index 7f75b32..94801e4 100755 +index 7f75b32d..94801e47 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -19,7 +19,7 @@ test_run() { diff --git a/SOURCES/0431-TEST-14-IMSM-add-rd.device.timeout.patch b/SOURCES/0431-TEST-14-IMSM-add-rd.device.timeout.patch index 5dfb0fc..638115f 100644 --- a/SOURCES/0431-TEST-14-IMSM-add-rd.device.timeout.patch +++ b/SOURCES/0431-TEST-14-IMSM-add-rd.device.timeout.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-14-IMSM: add rd.device.timeout 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh -index a600e1c..8e99b1f 100755 +index a600e1c0..8e99b1f6 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -33,8 +33,8 @@ test_run() { diff --git a/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch b/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch index 5d48816..190c320 100644 --- a/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch +++ b/SOURCES/0432-lsinitrd-Suppress-cat-write-error-Broken-pipe.patch @@ -54,7 +54,7 @@ Conflicts: 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/lsinitrd.sh b/lsinitrd.sh -index 88fe983..4103ee2 100755 +index 88fe9834..4103ee23 100755 --- a/lsinitrd.sh +++ b/lsinitrd.sh @@ -171,39 +171,35 @@ case $bin in diff --git a/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch b/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch index c129a1b..e25687a 100644 --- a/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch +++ b/SOURCES/0433-network-support-multiple-vlan-team-bridge-and-bond.patch @@ -14,7 +14,7 @@ Subject: [PATCH] network: support multiple vlan, team, bridge and bond 7 files changed, 254 insertions(+), 298 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index cedf9a7..d7503c7 100755 +index cedf9a77..d7503c7f 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -17,79 +17,12 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh @@ -460,7 +460,7 @@ index cedf9a7..d7503c7 100755 BOOTDEV=$(cat /tmp/net.bootdev) if [ "$netif" = "$BOOTDEV" ] || [ "$BOOTDEV" = "$(cat /sys/class/net/${netif}/address)" ]; then diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 526dd5c..08072fb 100755 +index 526dd5cf..08072fbe 100755 --- a/modules.d/40network/net-genrules.sh +++ b/modules.d/40network/net-genrules.sh @@ -1,6 +1,4 @@ @@ -513,7 +513,7 @@ index 526dd5c..08072fb 100755 RAW_IFACES="$(trim "$RAW_IFACES")" diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 7120193..de334d9 100755 +index 71201938..de334d98 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -102,7 +102,8 @@ ifdown() { @@ -547,7 +547,7 @@ index 7120193..de334d9 100755 } diff --git a/modules.d/40network/parse-bridge.sh b/modules.d/40network/parse-bridge.sh -index a910109..5c3af29 100755 +index a9101094..5c3af292 100755 --- a/modules.d/40network/parse-bridge.sh +++ b/modules.d/40network/parse-bridge.sh @@ -1,6 +1,4 @@ @@ -613,7 +613,7 @@ index a910109..5c3af29 100755 + echo "bridgeslaves=\"$bridgeslaves\"" >> /tmp/bridge.${bridgename}.info +done diff --git a/modules.d/40network/parse-team.sh b/modules.d/40network/parse-team.sh -index a836d68..136c370 100755 +index a836d688..136c3705 100755 --- a/modules.d/40network/parse-team.sh +++ b/modules.d/40network/parse-team.sh @@ -6,14 +6,6 @@ @@ -680,7 +680,7 @@ index a836d68..136c370 100755 + fi +done diff --git a/modules.d/40network/parse-vlan.sh b/modules.d/40network/parse-vlan.sh -index 3ba2289..5a747f0 100755 +index 3ba22892..5a747f0f 100755 --- a/modules.d/40network/parse-vlan.sh +++ b/modules.d/40network/parse-vlan.sh @@ -4,14 +4,6 @@ @@ -723,7 +723,7 @@ index 3ba2289..5a747f0 100755 + echo "$vlanname" > /tmp/vlan.${vlanname}.${phydevice} +done diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh -index cab7477..a077da1 100755 +index cab74772..a077da1c 100755 --- a/modules.d/45ifcfg/write-ifcfg.sh +++ b/modules.d/45ifcfg/write-ifcfg.sh @@ -7,14 +7,6 @@ type is_persistent_ethernet_name >/dev/null 2>&1 || . /lib/net-lib.sh diff --git a/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch b/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch index 935c71b..f9d83e8 100644 --- a/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch +++ b/SOURCES/0434-TEST-70-BONDBRIDGETEAMVLAN-add-testcase-for-testsuit.patch @@ -33,7 +33,7 @@ multiple vlans diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/99-idesymlinks.rules b/test/TEST-70-BONDBRIDGETEAMVLAN/99-idesymlinks.rules new file mode 100644 -index 0000000..d557790 +index 00000000..d557790a --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/99-idesymlinks.rules @@ -0,0 +1,8 @@ @@ -47,7 +47,7 @@ index 0000000..d557790 +ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdd*", SYMLINK+="sdd$env{MINOR}" diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/Makefile b/test/TEST-70-BONDBRIDGETEAMVLAN/Makefile new file mode 100644 -index 0000000..aad2705 +index 00000000..aad27059 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/Makefile @@ -0,0 +1,10 @@ @@ -63,7 +63,7 @@ index 0000000..aad2705 + @basedir=../.. testdir=../ ./test.sh --run diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh new file mode 100755 -index 0000000..2018393 +index 00000000..2018393b --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh @@ -0,0 +1,22 @@ @@ -91,7 +91,7 @@ index 0000000..2018393 +poweroff -f diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf new file mode 100644 -index 0000000..ec810c2 +index 00000000..ec810c29 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf @@ -0,0 +1,27 @@ @@ -124,7 +124,7 @@ index 0000000..ec810c2 +} diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd2.conf b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd2.conf new file mode 100644 -index 0000000..90f0c30 +index 00000000..90f0c302 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd2.conf @@ -0,0 +1,15 @@ @@ -145,14 +145,14 @@ index 0000000..90f0c30 +} diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/exports b/test/TEST-70-BONDBRIDGETEAMVLAN/exports new file mode 100644 -index 0000000..ff5f29b +index 00000000..ff5f29b1 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/exports @@ -0,0 +1 @@ +/nfs/client 192.168.50.0/24(rw,insecure,no_subtree_check,no_root_squash) diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/finished-false.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/finished-false.sh new file mode 100755 -index 0000000..ecdbef9 +index 00000000..ecdbef95 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/finished-false.sh @@ -0,0 +1,2 @@ @@ -160,7 +160,7 @@ index 0000000..ecdbef9 +exit 1 diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/hard-off.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/hard-off.sh new file mode 100755 -index 0000000..12c3d5a +index 00000000..12c3d5ac --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/hard-off.sh @@ -0,0 +1,3 @@ @@ -169,7 +169,7 @@ index 0000000..12c3d5a +getarg failme && poweroff -f diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/hosts b/test/TEST-70-BONDBRIDGETEAMVLAN/hosts new file mode 100644 -index 0000000..d02a4e9 +index 00000000..d02a4e9b --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/hosts @@ -0,0 +1,5 @@ @@ -180,7 +180,7 @@ index 0000000..d02a4e9 +192.168.50.102 client-if3 diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh new file mode 100755 -index 0000000..9585a47 +index 00000000..9585a47c --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh @@ -0,0 +1,117 @@ @@ -303,7 +303,7 @@ index 0000000..9585a47 +poweroff -f diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh new file mode 100755 -index 0000000..54ceb9e +index 00000000..54ceb9e1 --- /dev/null +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh @@ -0,0 +1,308 @@ diff --git a/SOURCES/0435-dracut.spec-remove-dd.patch b/SOURCES/0435-dracut.spec-remove-dd.patch index ca9b47a..cb97e53 100644 --- a/SOURCES/0435-dracut.spec-remove-dd.patch +++ b/SOURCES/0435-dracut.spec-remove-dd.patch @@ -9,7 +9,7 @@ dd is part of coreutils 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.spec b/dracut.spec -index 5c4b047..780ed70 100644 +index 5c4b0471..780ed703 100644 --- a/dracut.spec +++ b/dracut.spec @@ -91,7 +91,7 @@ Requires: gzip xz diff --git a/SOURCES/0436-watchdog-Do-not-add-hooks-if-systemd-module-is-inclu.patch b/SOURCES/0436-watchdog-Do-not-add-hooks-if-systemd-module-is-inclu.patch index a200b3e..09dd5a9 100644 --- a/SOURCES/0436-watchdog-Do-not-add-hooks-if-systemd-module-is-inclu.patch +++ b/SOURCES/0436-watchdog-Do-not-add-hooks-if-systemd-module-is-inclu.patch @@ -14,7 +14,7 @@ Cc: Harald Hoyer 1 file changed, 5 insertions(+) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index b7725ef..7e32210 100755 +index b7725ef7..7e32210e 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -11,6 +11,11 @@ depends() { diff --git a/SOURCES/0437-watchdog-install-module-for-active-watchdog.patch b/SOURCES/0437-watchdog-install-module-for-active-watchdog.patch index 2477655..a9fd352 100644 --- a/SOURCES/0437-watchdog-install-module-for-active-watchdog.patch +++ b/SOURCES/0437-watchdog-install-module-for-active-watchdog.patch @@ -57,7 +57,7 @@ Cc: Harald Hoyer 1 file changed, 28 insertions(+) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index 7e32210..4680936 100755 +index 7e32210e..4680936f 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -31,3 +31,31 @@ install() { diff --git a/SOURCES/0438-watchdog-ensure-that-module-is-loaded-as-early-as-po.patch b/SOURCES/0438-watchdog-ensure-that-module-is-loaded-as-early-as-po.patch index b9c1401..2f90e5a 100644 --- a/SOURCES/0438-watchdog-ensure-that-module-is-loaded-as-early-as-po.patch +++ b/SOURCES/0438-watchdog-ensure-that-module-is-loaded-as-early-as-po.patch @@ -24,7 +24,7 @@ Cc: Harald Hoyer 1 file changed, 5 insertions(+) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index 4680936..6b35f9f 100755 +index 4680936f..6b35f9f5 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -33,6 +33,7 @@ install() { diff --git a/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch b/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch index 2e6eaf8..c726181 100644 --- a/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch +++ b/SOURCES/0439-watchdog-module-setup.sh-rewrite.patch @@ -13,7 +13,7 @@ Subject: [PATCH] watchdog/module-setup.sh: rewrite 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index 6b35f9f..31102f4 100755 +index 6b35f9f5..31102f4e 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -13,54 +13,64 @@ depends() { diff --git a/SOURCES/0440-watchdog-clean-return-of-installkernel.patch b/SOURCES/0440-watchdog-clean-return-of-installkernel.patch index 30e353a..ae5269d 100644 --- a/SOURCES/0440-watchdog-clean-return-of-installkernel.patch +++ b/SOURCES/0440-watchdog-clean-return-of-installkernel.patch @@ -9,7 +9,7 @@ return 0, otherwise if _alldrivers is empty, the return code is fail 1 file changed, 2 insertions(+) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index 31102f4..fbf6d6d 100755 +index 31102f4e..fbf6d6dd 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -73,4 +73,6 @@ installkernel() { diff --git a/SOURCES/0441-watchdog-start-traversing-the-device-tree-from-the-r.patch b/SOURCES/0441-watchdog-start-traversing-the-device-tree-from-the-r.patch index 61846b4..3b76324 100644 --- a/SOURCES/0441-watchdog-start-traversing-the-device-tree-from-the-r.patch +++ b/SOURCES/0441-watchdog-start-traversing-the-device-tree-from-the-r.patch @@ -10,7 +10,7 @@ start with the device subtree, not with the parent of it 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh -index fbf6d6d..86b0aee 100755 +index fbf6d6dd..86b0aee8 100755 --- a/modules.d/04watchdog/module-setup.sh +++ b/modules.d/04watchdog/module-setup.sh @@ -55,7 +55,7 @@ installkernel() { diff --git a/SOURCES/0442-dracut.spec-remove-trailing-space.patch b/SOURCES/0442-dracut.spec-remove-trailing-space.patch index 87a75a4..ed67141 100644 --- a/SOURCES/0442-dracut.spec-remove-trailing-space.patch +++ b/SOURCES/0442-dracut.spec-remove-trailing-space.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.spec: remove trailing space 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.spec b/dracut.spec -index 780ed70..efb50b7 100644 +index 780ed703..efb50b77 100644 --- a/dracut.spec +++ b/dracut.spec @@ -91,7 +91,7 @@ Requires: gzip xz diff --git a/SOURCES/0443-fips-use-lib-modules-uname-r-modules.fips.patch b/SOURCES/0443-fips-use-lib-modules-uname-r-modules.fips.patch index 27cbd21..411728b 100644 --- a/SOURCES/0443-fips-use-lib-modules-uname-r-modules.fips.patch +++ b/SOURCES/0443-fips-use-lib-modules-uname-r-modules.fips.patch @@ -10,7 +10,7 @@ of the dracut module list. 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 77ed24e..e1296d7 100755 +index 77ed24ef..e1296d75 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -12,12 +12,17 @@ depends() { diff --git a/SOURCES/0444-fips-add-sha1-mb-to-fips-modules.patch b/SOURCES/0444-fips-add-sha1-mb-to-fips-modules.patch index 21a427a..c8f01da 100644 --- a/SOURCES/0444-fips-add-sha1-mb-to-fips-modules.patch +++ b/SOURCES/0444-fips-add-sha1-mb-to-fips-modules.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1357080 1 file changed, 1 insertion(+) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index e1296d7..32d10d0 100755 +index e1296d75..32d10d06 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -22,6 +22,7 @@ installkernel() { diff --git a/SOURCES/0445-nfs-install-all-nfs-modules-non-hostonly.patch b/SOURCES/0445-nfs-install-all-nfs-modules-non-hostonly.patch index 2113cbe..c8f09da 100644 --- a/SOURCES/0445-nfs-install-all-nfs-modules-non-hostonly.patch +++ b/SOURCES/0445-nfs-install-all-nfs-modules-non-hostonly.patch @@ -10,7 +10,7 @@ $host_fs_types contains nfs. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index 02838a4..de5a754 100755 +index 02838a49..de5a754a 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -25,7 +25,7 @@ depends() { diff --git a/SOURCES/0446-dracut.sh-extend-host_fs_types-with-filesystems.patch b/SOURCES/0446-dracut.sh-extend-host_fs_types-with-filesystems.patch index 0065cb6..17088de 100644 --- a/SOURCES/0446-dracut.sh-extend-host_fs_types-with-filesystems.patch +++ b/SOURCES/0446-dracut.sh-extend-host_fs_types-with-filesystems.patch @@ -12,7 +12,7 @@ filesystems. 1 file changed, 6 insertions(+) diff --git a/dracut.sh b/dracut.sh -index fefdefd..0a69973 100755 +index fefdefd5..0a699737 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1174,6 +1174,12 @@ for dev in "${!host_fs_types[@]}"; do diff --git a/SOURCES/0447-lvm-include-etc-lvm-lvm_-host_tag-.conf.patch b/SOURCES/0447-lvm-include-etc-lvm-lvm_-host_tag-.conf.patch index 9932873..2be6308 100644 --- a/SOURCES/0447-lvm-include-etc-lvm-lvm_-host_tag-.conf.patch +++ b/SOURCES/0447-lvm-include-etc-lvm-lvm_-host_tag-.conf.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1328778 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 5e374fb..23d63a0 100755 +index 5e374fbc..23d63a04 100755 --- a/modules.d/90lvm/module-setup.sh +++ b/modules.d/90lvm/module-setup.sh @@ -60,13 +60,16 @@ install() { diff --git a/SOURCES/0448-add-rd.emergency-reboot-poweroff-halt.patch b/SOURCES/0448-add-rd.emergency-reboot-poweroff-halt.patch index 847da39..97ac785 100644 --- a/SOURCES/0448-add-rd.emergency-reboot-poweroff-halt.patch +++ b/SOURCES/0448-add-rd.emergency-reboot-poweroff-halt.patch @@ -15,7 +15,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1359144 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 1cf962e..1fb4f74 100644 +index 1cf962e6..1fb4f746 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -108,6 +108,9 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 @@ -29,7 +29,7 @@ index 1cf962e..1fb4f74 100644 do not load kernel module . This parameter can be specified multiple times. diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh -index 5771dc5..b3e8d08 100755 +index 5771dc5e..b3e8d087 100755 --- a/modules.d/98systemd/dracut-emergency.sh +++ b/modules.d/98systemd/dracut-emergency.sh @@ -16,6 +16,7 @@ export _rdshell_name="dracut" action="Boot" hook="emergency" @@ -61,7 +61,7 @@ index 5771dc5..b3e8d08 100755 + exit 0 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 16bc74d..10d9cbc 100755 +index 16bc74d4..10d9cbc5 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1068,6 +1068,8 @@ emergency_shell() diff --git a/SOURCES/0449-fips-module-add-missing-spaces.patch b/SOURCES/0449-fips-module-add-missing-spaces.patch index e9bb912..4f90aff 100644 --- a/SOURCES/0449-fips-module-add-missing-spaces.patch +++ b/SOURCES/0449-fips-module-add-missing-spaces.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1359677 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 32d10d0..43d170f 100755 +index 32d10d06..43d170f1 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -20,8 +20,8 @@ installkernel() { diff --git a/SOURCES/0450-fips-remove-sha1-mb.patch b/SOURCES/0450-fips-remove-sha1-mb.patch index ce3ffd3..12a6a41 100644 --- a/SOURCES/0450-fips-remove-sha1-mb.patch +++ b/SOURCES/0450-fips-remove-sha1-mb.patch @@ -9,7 +9,7 @@ This module should be loaded automatically, if the HW supports it. 1 file changed, 1 deletion(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 43d170f..dc47634 100755 +index 43d170f1..dc476347 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -22,7 +22,6 @@ installkernel() { diff --git a/SOURCES/0451-dracut-functions.sh-catch-all-lvm-slaves.patch b/SOURCES/0451-dracut-functions.sh-catch-all-lvm-slaves.patch index b0adaaa..d086aad 100644 --- a/SOURCES/0451-dracut-functions.sh-catch-all-lvm-slaves.patch +++ b/SOURCES/0451-dracut-functions.sh-catch-all-lvm-slaves.patch @@ -11,7 +11,7 @@ otherwise only the first lvm VG member would be processed 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 4a9729c..61726e4 100755 +index 4a9729c7..61726e44 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -632,7 +632,7 @@ check_block_and_slaves_all() { diff --git a/SOURCES/0452-systemd-dracut-cmdline.sh-unset-UNSET-root.patch b/SOURCES/0452-systemd-dracut-cmdline.sh-unset-UNSET-root.patch index af6d777..3ef4214 100644 --- a/SOURCES/0452-systemd-dracut-cmdline.sh-unset-UNSET-root.patch +++ b/SOURCES/0452-systemd-dracut-cmdline.sh-unset-UNSET-root.patch @@ -10,7 +10,7 @@ caused by commit 9aa224cc 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh -index d22e4d6..17b30a3 100755 +index d22e4d6e..17b30a34 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -26,7 +26,7 @@ source_conf /etc/conf.d diff --git a/SOURCES/0453-network-ibft-put-IPv6-IP-in-brackets.patch b/SOURCES/0453-network-ibft-put-IPv6-IP-in-brackets.patch index 872a812..b8b543a 100644 --- a/SOURCES/0453-network-ibft-put-IPv6-IP-in-brackets.patch +++ b/SOURCES/0453-network-ibft-put-IPv6-IP-in-brackets.patch @@ -15,7 +15,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1322592#c19 1 file changed, 1 insertion(+) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index de334d9..3459e89 100755 +index de334d98..3459e898 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -277,6 +277,7 @@ ibft_to_cmdline() { diff --git a/SOURCES/0454-url-lib-ca-bundle.crt-changed-to-a-symlink.patch b/SOURCES/0454-url-lib-ca-bundle.crt-changed-to-a-symlink.patch index b81948e..d58824f 100644 --- a/SOURCES/0454-url-lib-ca-bundle.crt-changed-to-a-symlink.patch +++ b/SOURCES/0454-url-lib-ca-bundle.crt-changed-to-a-symlink.patch @@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1341280 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/45url-lib/module-setup.sh b/modules.d/45url-lib/module-setup.sh -index f2d068b..6a2bb83 100755 +index f2d068b3..6a2bb832 100755 --- a/modules.d/45url-lib/module-setup.sh +++ b/modules.d/45url-lib/module-setup.sh @@ -28,7 +28,7 @@ install() { diff --git a/SOURCES/0455-dracut.sh-document-hostonly-i18n-and-no-hostonly-i18.patch b/SOURCES/0455-dracut.sh-document-hostonly-i18n-and-no-hostonly-i18.patch index 33fef60..cb90315 100644 --- a/SOURCES/0455-dracut.sh-document-hostonly-i18n-and-no-hostonly-i18.patch +++ b/SOURCES/0455-dracut.sh-document-hostonly-i18n-and-no-hostonly-i18.patch @@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1266448 1 file changed, 3 insertions(+) diff --git a/dracut.sh b/dracut.sh -index 0a69973..90ea9c3 100755 +index 0a699737..90ea9c32 100755 --- a/dracut.sh +++ b/dracut.sh @@ -141,6 +141,9 @@ Creates initial ramdisk images for preloading modules diff --git a/SOURCES/0456-dracut.cmdline.7.asc-document-rd.shell-0-for-rd.emer.patch b/SOURCES/0456-dracut.cmdline.7.asc-document-rd.shell-0-for-rd.emer.patch index c1c49f8..e3fc8e0 100644 --- a/SOURCES/0456-dracut.cmdline.7.asc-document-rd.shell-0-for-rd.emer.patch +++ b/SOURCES/0456-dracut.cmdline.7.asc-document-rd.shell-0-for-rd.emer.patch @@ -8,7 +8,7 @@ Subject: [PATCH] dracut.cmdline.7.asc: document rd.shell=0 for rd.emergency 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 1fb4f74..b479fa8 100644 +index 1fb4f746..b479fa89 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -109,7 +109,8 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7 diff --git a/SOURCES/0457-nfs-install-more-kernel-modules.patch b/SOURCES/0457-nfs-install-more-kernel-modules.patch index 1a0da15..36c8ce0 100644 --- a/SOURCES/0457-nfs-install-more-kernel-modules.patch +++ b/SOURCES/0457-nfs-install-more-kernel-modules.patch @@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1367374 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index de5a754..dc2e722 100755 +index de5a754a..dc2e7221 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -25,7 +25,7 @@ depends() { diff --git a/SOURCES/0458-TEST-16-DMSQUASH-add-sr_mod.patch b/SOURCES/0458-TEST-16-DMSQUASH-add-sr_mod.patch index 0412751..7347421 100644 --- a/SOURCES/0458-TEST-16-DMSQUASH-add-sr_mod.patch +++ b/SOURCES/0458-TEST-16-DMSQUASH-add-sr_mod.patch @@ -9,7 +9,7 @@ otherwise no cdrom can be accessed on RHEL-7 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh -index 9d584e3..e80ec5c 100755 +index 9d584e39..e80ec5c2 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -40,7 +40,7 @@ test_setup() { diff --git a/SOURCES/0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch b/SOURCES/0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch index 452b722..30ae8bd 100644 --- a/SOURCES/0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch +++ b/SOURCES/0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1369342 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh -index af2798d..4bab0c7 100755 +index af2798dc..4bab0c7d 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -69,7 +69,7 @@ cmdline() { diff --git a/SOURCES/0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch b/SOURCES/0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch index cfd1f16..a761d17 100644 --- a/SOURCES/0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch +++ b/SOURCES/0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1304069 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 3c96204..68afe91 100755 +index 3c962044..68afe91b 100755 --- a/modules.d/40network/parse-ip-opts.sh +++ b/modules.d/40network/parse-ip-opts.sh @@ -38,7 +38,7 @@ unset count diff --git a/SOURCES/0461-network-fix-dhcp-classless_static_routes.patch b/SOURCES/0461-network-fix-dhcp-classless_static_routes.patch index 2d3e875..d812ee7 100644 --- a/SOURCES/0461-network-fix-dhcp-classless_static_routes.patch +++ b/SOURCES/0461-network-fix-dhcp-classless_static_routes.patch @@ -12,7 +12,7 @@ of the parse function. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -index f6c77f2..2a2e234 100755 +index f6c77f2f..2a2e2343 100755 --- a/modules.d/40network/dhclient-script.sh +++ b/modules.d/40network/dhclient-script.sh @@ -175,7 +175,7 @@ case $reason in 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 9955a46..898f1a5 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 @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1380581 1 file changed, 2 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 3459e89..9083aea 100755 +index 3459e898..9083aea7 100755 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -241,8 +241,6 @@ ibft_to_cmdline() { diff --git a/SOURCES/0463-add-README.md.patch b/SOURCES/0463-add-README.md.patch index 8d6df50..d1f3671 100644 --- a/SOURCES/0463-add-README.md.patch +++ b/SOURCES/0463-add-README.md.patch @@ -10,7 +10,7 @@ Subject: [PATCH] add README.md diff --git a/README.md b/README.md new file mode 100644 -index 0000000..4c53f28 +index 00000000..4c53f28d --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ diff --git a/SOURCES/0464-README.md-update.patch b/SOURCES/0464-README.md-update.patch index 41eba0a..1c6bf42 100644 --- a/SOURCES/0464-README.md-update.patch +++ b/SOURCES/0464-README.md-update.patch @@ -8,7 +8,7 @@ Subject: [PATCH] README.md: update 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md -index 4c53f28..9617eaf 100644 +index 4c53f28d..9617eaf9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ 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 index a39949b..de2a0d1 100644 --- 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 @@ -10,7 +10,7 @@ Subject: [PATCH] test/test-rpms.txt: add list of rpms to install diff --git a/test/test-rpms.txt b/test/test-rpms.txt new file mode 100644 -index 0000000..1723d8e +index 00000000..1723d8e9 --- /dev/null +++ b/test/test-rpms.txt @@ -0,0 +1,26 @@ diff --git a/SOURCES/0466-test-remove-sudo-calls.patch b/SOURCES/0466-test-remove-sudo-calls.patch index 20143d7..d296171 100644 --- a/SOURCES/0466-test-remove-sudo-calls.patch +++ b/SOURCES/0466-test-remove-sudo-calls.patch @@ -29,7 +29,7 @@ $ sudo make check 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 +index aef07373..97e8017e 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -45,7 +45,7 @@ test_setup() { @@ -51,7 +51,7 @@ index aef0737..97e8017 100755 -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 +index 6f33181c..2a077b04 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -45,7 +45,7 @@ test_setup() { @@ -73,7 +73,7 @@ index 6f33181..2a077b0 100755 -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 +index 363f8b04..c3f810ab 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -72,7 +72,7 @@ test_setup() { @@ -95,7 +95,7 @@ index 363f8b0..c3f810a 100755 -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 +index 93c33890..1adb34e9 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -263,7 +263,7 @@ EOF @@ -108,7 +108,7 @@ index 93c3389..1adb34e 100755 -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 +index 45edda2c..7f99c0e0 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -43,7 +43,7 @@ test_setup() { @@ -130,7 +130,7 @@ index 45edda2..7f99c0e 100755 -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 +index dd1f8ead..a4ee86da 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -40,7 +40,7 @@ test_setup() { @@ -152,7 +152,7 @@ index dd1f8ea..a4ee86d 100755 -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 +index 5f9cfc56..aae5e8b4 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -81,7 +81,7 @@ test_setup() { @@ -174,7 +174,7 @@ index 5f9cfc5..aae5e8b 100755 -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 +index 94801e47..8194166b 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() { @@ -196,7 +196,7 @@ index 94801e4..8194166 100755 -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 +index 8e99b1f6..783ec4a5 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -70,7 +70,7 @@ test_setup() { @@ -218,7 +218,7 @@ index 8e99b1f..783ec4a 100755 -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 +index c086677f..1e3e18c1 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -41,7 +41,7 @@ test_setup() { @@ -240,7 +240,7 @@ index c086677..1e3e18c 100755 -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 +index e80ec5c2..6daa35e7 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -38,7 +38,7 @@ test_setup() { @@ -262,7 +262,7 @@ index e80ec5c..6daa35e 100755 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 +index dc6e5885..f15e1a3d 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -40,7 +40,7 @@ test_setup() { @@ -284,7 +284,7 @@ index dc6e588..f15e1a3 100755 -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 +index 49dbc10e..64fc5501 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -26,7 +26,7 @@ run_server() { @@ -359,7 +359,7 @@ index 49dbc10..64fc550 100755 fi } diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh -index 5e59f0a..62bef9c 100755 +index 5e59f0a8..62bef9cc 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -28,7 +28,7 @@ run_server() { @@ -431,7 +431,7 @@ index 5e59f0a..62bef9c 100755 fi } diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh -index 848a103..73123c2 100755 +index 848a103f..73123c22 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -26,7 +26,7 @@ run_server() { @@ -530,7 +530,7 @@ index 848a103..73123c2 100755 fi } diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh -index 05273be..642a748 100755 +index 05273be7..642a7486 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -26,7 +26,7 @@ run_server() { @@ -583,7 +583,7 @@ index 05273be..642a748 100755 fi } diff --git a/test/TEST-60-MTUMAC/test.sh b/test/TEST-60-MTUMAC/test.sh -index 7633ac1..b70e316 100755 +index 7633ac13..b70e3161 100755 --- a/test/TEST-60-MTUMAC/test.sh +++ b/test/TEST-60-MTUMAC/test.sh @@ -25,7 +25,7 @@ run_server() { @@ -627,7 +627,7 @@ index 7633ac1..b70e316 100755 fi } diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh -index 54ceb9e..dcf9d5c 100755 +index 54ceb9e1..dcf9d5cf 100755 --- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh @@ -32,7 +32,7 @@ run_server() { @@ -671,7 +671,7 @@ index 54ceb9e..dcf9d5c 100755 fi } diff --git a/test/run-qemu b/test/run-qemu -index 00c2f6a..07ce4a5 100755 +index 00c2f6a8..07ce4a59 100755 --- a/test/run-qemu +++ b/test/run-qemu @@ -25,4 +25,4 @@ else diff --git a/SOURCES/0467-TEST-ISCSI-fix-command-check.patch b/SOURCES/0467-TEST-ISCSI-fix-command-check.patch index 91095fa..e058d52 100644 --- a/SOURCES/0467-TEST-ISCSI-fix-command-check.patch +++ b/SOURCES/0467-TEST-ISCSI-fix-command-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-ISCSI: fix command check 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 +index 62bef9cc..da86b837 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -136,8 +136,8 @@ test_run() { diff --git a/SOURCES/0468-test-test-rpms.txt-add-gzip.patch b/SOURCES/0468-test-test-rpms.txt-add-gzip.patch index 5404f93..0781dd7 100644 --- a/SOURCES/0468-test-test-rpms.txt-add-gzip.patch +++ b/SOURCES/0468-test-test-rpms.txt-add-gzip.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/test-rpms.txt: add gzip 1 file changed, 1 insertion(+) diff --git a/test/test-rpms.txt b/test/test-rpms.txt -index 1723d8e..10596da 100644 +index 1723d8e9..10596da7 100644 --- a/test/test-rpms.txt +++ b/test/test-rpms.txt @@ -19,6 +19,7 @@ btrfs-progs diff --git a/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch b/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch index 8e82267..2decd24 100644 --- a/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch +++ b/SOURCES/0469-TEST-99-RPM-ignore-openldap-leftovers.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-99-RPM: ignore openldap leftovers 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 +index 5afc313e..fc682734 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/*' \ 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 index a82cbfe..235520b 100644 --- a/SOURCES/0470-test-Makefile-proper-return-code-for-make-check.patch +++ b/SOURCES/0470-test-Makefile-proper-return-code-for-make-check.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test/Makefile: proper return code for "make check" 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Makefile b/test/Makefile -index f71f854..eaa944f 100644 +index f71f8540..eaa944fb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -2,13 +2,14 @@ diff --git a/SOURCES/0471-test-rpms.txt-add-dhcp.patch b/SOURCES/0471-test-rpms.txt-add-dhcp.patch index 31f72c2..8bc8178 100644 --- a/SOURCES/0471-test-rpms.txt-add-dhcp.patch +++ b/SOURCES/0471-test-rpms.txt-add-dhcp.patch @@ -8,7 +8,7 @@ Subject: [PATCH] test-rpms.txt: add dhcp 1 file changed, 1 insertion(+) diff --git a/test/test-rpms.txt b/test/test-rpms.txt -index 10596da..95376bd 100644 +index 10596da7..95376bd2 100644 --- a/test/test-rpms.txt +++ b/test/test-rpms.txt @@ -8,6 +8,7 @@ cryptsetup 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 index 91765e0..109aceb 100644 --- a/SOURCES/0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch +++ b/SOURCES/0472-TEST-30-ISCSI-test.sh-set-device-timeout.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-30-ISCSI/test.sh: set device timeout 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 +index da86b837..a610b0e4 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -49,7 +49,7 @@ run_client() { diff --git a/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch b/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch index ab6035d..03e4331 100644 --- a/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch +++ b/SOURCES/0473-TEST-70-BONDBRIDGETEAMVLAN-fix-server-ip-setup.patch @@ -8,7 +8,7 @@ Subject: [PATCH] TEST-70-BONDBRIDGETEAMVLAN: fix server ip setup 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 +index 9585a47c..9f45c420 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 diff --git a/SOURCES/0474-testsuite-guard-against-kernel-panic.patch b/SOURCES/0474-testsuite-guard-against-kernel-panic.patch index 86ba1e3..3be052e 100644 --- a/SOURCES/0474-testsuite-guard-against-kernel-panic.patch +++ b/SOURCES/0474-testsuite-guard-against-kernel-panic.patch @@ -27,7 +27,7 @@ call qemu with --no-reboot and append "panic=1" to the kernel cmdline 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 +index 97e8017e..6b79dee9 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -14,7 +14,8 @@ test_run() { @@ -41,7 +41,7 @@ index 97e8017..6b79dee 100755 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 +index 2a077b04..23591804 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -13,7 +13,8 @@ test_run() { @@ -55,7 +55,7 @@ index 2a077b0..2359180 100755 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 +index c3f810ab..cd6f2826 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -20,7 +20,8 @@ client_run() { @@ -69,7 +69,7 @@ index c3f810a..cd6f282 100755 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 +index 1adb34e9..13ab37b4 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -22,7 +22,8 @@ client_run() { @@ -83,7 +83,7 @@ index 1adb34e..13ab37b 100755 if (($? != 0)); then diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh -index 7f99c0e..364f7d5 100755 +index 7f99c0e0..364f7d51 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -12,7 +12,8 @@ test_run() { @@ -97,7 +97,7 @@ index 7f99c0e..364f7d5 100755 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 +index a4ee86da..fb009461 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -11,7 +11,8 @@ test_run() { @@ -111,7 +111,7 @@ index a4ee86d..fb00946 100755 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 +index aae5e8b4..d4cb9d00 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -19,7 +19,8 @@ client_run() { @@ -125,7 +125,7 @@ index aae5e8b..d4cb9d0 100755 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 +index 8194166b..196dd3b6 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() { @@ -159,7 +159,7 @@ index 8194166..196dd3b 100755 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 +index 783ec4a5..4e5d665f 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -15,7 +15,8 @@ client_run() { @@ -173,7 +173,7 @@ index 783ec4a..4e5d665 100755 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 +index 1e3e18c1..51ffd966 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -11,7 +11,8 @@ test_run() { @@ -187,7 +187,7 @@ index 1e3e18c..51ffd96 100755 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 +index 6daa35e7..3b4600e1 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -21,7 +21,8 @@ test_run() { @@ -201,7 +201,7 @@ index 6daa35e..3b4600e 100755 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 +index f15e1a3d..9a9ed6f3 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -11,7 +11,8 @@ test_run() { @@ -215,7 +215,7 @@ index f15e1a3..9a9ed6f 100755 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 +index 64fc5501..9e02a18d 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -23,7 +23,8 @@ run_server() { @@ -239,7 +239,7 @@ index 64fc550..9e02a18 100755 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 +index a610b0e4..a82a9508 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -25,7 +25,8 @@ run_server() { @@ -263,7 +263,7 @@ index a610b0e..a82a950 100755 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 +index 73123c22..a781ef0c 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -24,7 +24,8 @@ run_server() { @@ -287,7 +287,7 @@ index 73123c2..a781ef0 100755 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 +index 642a7486..627b8ca7 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -23,7 +23,8 @@ run_server() { @@ -311,7 +311,7 @@ index 642a748..627b8ca 100755 { 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 +index b70e3161..f2d5c4a0 100755 --- a/test/TEST-60-MTUMAC/test.sh +++ b/test/TEST-60-MTUMAC/test.sh @@ -22,7 +22,8 @@ run_server() { @@ -335,7 +335,7 @@ index b70e316..f2d5c4a 100755 { diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf b/test/TEST-70-BONDBRIDGETEAMVLAN/dhcpd.conf -index ec810c2..e26bd60 100644 +index ec810c29..e26bd60b 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 { @@ -347,7 +347,7 @@ index ec810c2..e26bd60 100644 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 +index dcf9d5cf..9cf1f1a1 100755 --- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh +++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh @@ -29,7 +29,8 @@ run_server() { diff --git a/SOURCES/0475-TEST-99-RPM-speedup-test.patch b/SOURCES/0475-TEST-99-RPM-speedup-test.patch index 33f8f7a..e7db6d1 100644 --- a/SOURCES/0475-TEST-99-RPM-speedup-test.patch +++ b/SOURCES/0475-TEST-99-RPM-speedup-test.patch @@ -9,7 +9,7 @@ Subject: [PATCH] TEST-99-RPM: speedup test 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile -index 18f5a88..9798737 100644 +index 18f5a88c..97987377 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ rpm: dracut-$(VERSION).tar.bz2 syncheck @@ -22,7 +22,7 @@ index 18f5a88..9798737 100644 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 +index fc682734..17c0bf8d 100755 --- a/test/TEST-99-RPM/test.sh +++ b/test/TEST-99-RPM/test.sh @@ -1,11 +1,14 @@ 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 index 4c59c87..c9132a3 100644 --- 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 @@ -9,7 +9,7 @@ Subject: [PATCH] fips/module-setup.sh: also blacklist the alias resolved 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 +index dc476347..3bf6c332 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -11,7 +11,7 @@ depends() { 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 index 3e035e4..eb9e08b 100644 --- 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 @@ -10,7 +10,7 @@ if the module name is the alias crypto-, check if is in 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 +index 7fa48f13..0b69a823 100755 --- a/modules.d/01fips/fips.sh +++ b/modules.d/01fips/fips.sh @@ -96,7 +96,7 @@ do_fips() diff --git a/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch index a25a238..add781c 100644 --- a/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch +++ b/SOURCES/0478-README.md-correct-CentOS-build-job-link.patch @@ -8,7 +8,7 @@ Subject: [PATCH] README.md: correct CentOS build job link 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md -index 9617eaf..8bfda44 100644 +index 9617eaf9..8bfda446 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ diff --git a/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch index e0b210c..c481ba2 100644 --- a/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch +++ b/SOURCES/0479-README.md-correct-CentOS-build-job-link.patch @@ -8,7 +8,7 @@ Subject: [PATCH] README.md: correct CentOS build job link 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md -index 8bfda44..9cfccae 100644 +index 8bfda446..9cfccae7 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ diff --git a/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch b/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch index 5d1b31f..4fb38b8 100644 --- a/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch +++ b/SOURCES/0480-README.md-correct-CentOS-build-job-link.patch @@ -8,7 +8,7 @@ Subject: [PATCH] README.md: correct CentOS build job link 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md -index 9cfccae..2f88ff7 100644 +index 9cfccae7..2f88ff74 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ 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 index ed873a0..ba629db 100644 --- a/SOURCES/0481-fips-module-setup.sh-make-tcrypt-non-optional.patch +++ b/SOURCES/0481-fips-module-setup.sh-make-tcrypt-non-optional.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fips/module-setup.sh: make tcrypt non-optional 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 +index 3bf6c332..d553a8c1 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -21,12 +21,12 @@ installkernel() { 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 index 67c5bb6..8eb0020 100644 --- a/SOURCES/0482-dracut.sh-skip-empty-lines-in-proc-modules.patch +++ b/SOURCES/0482-dracut.sh-skip-empty-lines-in-proc-modules.patch @@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1405025 1 file changed, 1 insertion(+) diff --git a/dracut.sh b/dracut.sh -index 90ea9c3..e45dc7b 100755 +index 90ea9c32..e45dc7bb 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1132,6 +1132,7 @@ if [[ $hostonly ]]; then 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 index 7b8e28c..3c14b22 100644 --- 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 @@ -9,7 +9,7 @@ Subject: [PATCH] dracut.conf.5.asc: add Warning about leading and trailing 1 file changed, 5 insertions(+) diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc -index c20a341..f4ad49d 100644 +index c20a341d..f4ad49d2 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. diff --git a/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch b/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch index 2e20472..feb02a8 100644 --- a/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch +++ b/SOURCES/0484-systemd-dracut-cmdline.sh-unset-UNSET-root.patch @@ -10,7 +10,7 @@ caused by commit 9aa224cc 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 +index 17b30a34..630f3f92 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -79,6 +79,8 @@ esac diff --git a/SOURCES/0485-add-dracut.pc-pkg-config-file.patch b/SOURCES/0485-add-dracut.pc-pkg-config-file.patch index 3828abc..a898afc 100644 --- a/SOURCES/0485-add-dracut.pc-pkg-config-file.patch +++ b/SOURCES/0485-add-dracut.pc-pkg-config-file.patch @@ -9,7 +9,7 @@ Subject: [PATCH] add dracut.pc pkg-config file 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 9798737..2977d18 100644 +index 97987377..2977d187 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ mandir ?= ${prefix}/share/man @@ -56,7 +56,7 @@ index 9798737..2977d18 100644 dracut-version.sh: @echo "DRACUT_VERSION=$(VERSION)$(GITVERSION)" > dracut-version.sh diff --git a/dracut.spec b/dracut.spec -index efb50b7..bf10d08 100644 +index efb50b77..bf10d08b 100644 --- a/dracut.spec +++ b/dracut.spec @@ -312,6 +312,7 @@ rm -rf -- $RPM_BUILD_ROOT 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 index ffb4b2c..631aa06 100644 --- 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 @@ -11,7 +11,7 @@ is empty, depmod was not run most likely. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dracut.sh b/dracut.sh -index e45dc7b..f4e8509 100755 +index e45dc7bb..f4e85095 100755 --- a/dracut.sh +++ b/dracut.sh @@ -969,9 +969,14 @@ esac 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 index 461f29d..92032e0 100644 --- 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 @@ -78,7 +78,7 @@ Signed-off-by: Xunlei Pang diff --git a/modules.d/99base/memtrace-ko.sh b/modules.d/99base/memtrace-ko.sh new file mode 100755 -index 0000000..ee035e1 +index 00000000..ee035e15 --- /dev/null +++ b/modules.d/99base/memtrace-ko.sh @@ -0,0 +1,191 @@ diff --git a/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch b/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch index b0b220b..b08f834 100644 --- a/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch +++ b/SOURCES/0488-99base-apply-kernel-module-memory-debug-support.patch @@ -18,7 +18,7 @@ Signed-off-by: Xunlei Pang 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 +index 630f3f92..b6b899f0 100755 --- a/modules.d/98systemd/dracut-cmdline.sh +++ b/modules.d/98systemd/dracut-cmdline.sh @@ -43,7 +43,7 @@ export root @@ -31,7 +31,7 @@ index 630f3f9..b6b899f 100755 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 +index 55b051ab..199cf965 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 @@ -44,7 +44,7 @@ index 55b051a..199cf96 100755 # 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 +index 4c3eefcd..c079972e 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 @@ -63,7 +63,7 @@ index 4c3eefc..c079972 100755 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 +index 0dbf32a5..241cd1e5 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 @@ -76,7 +76,7 @@ index 0dbf32a..241cd1e 100755 source_hook pre-trigger diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 10d9cbc..78e01a7 100755 +index 10d9cbc5..78e01a78 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1177,12 +1177,20 @@ are_lists_eq() { @@ -111,7 +111,7 @@ index 10d9cbc..78e01a7 100755 esac } diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh -index 7bbe670..473bf42 100755 +index 7bbe6703..473bf42e 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -124,7 +124,7 @@ if getarg "rd.cmdline=ask"; then @@ -156,7 +156,7 @@ index 7bbe670..473bf42 100755 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 +index d5e78613..8fd4e80d 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -34,6 +34,7 @@ install() { 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 index 71cc7ae..e428a6d 100644 --- 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 @@ -11,7 +11,7 @@ Signed-off-by: Xunlei Pang 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index b479fa8..1626638 100644 +index b479fa89..16266381 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. 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 index 91a8071..87210cd 100644 --- 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 @@ -13,7 +13,7 @@ Signed-off-by: Xunlei Pang 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 +index 6b79dee9..0ef7e105 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -15,7 +15,7 @@ test_run() { 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 index 7513ca1..db658d2 100644 --- a/SOURCES/0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch +++ b/SOURCES/0491-dracut-functions.sh-remove-duplicate-declaratio-of-l.patch @@ -9,7 +9,7 @@ Subject: [PATCH] dracut-functions.sh: remove duplicate declaratio of local 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 61726e4..3c4118a 100755 +index 61726e44..3c4118a9 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -426,7 +426,7 @@ shorten_persistent_dev() { diff --git a/SOURCES/0492-network-ifup-write-override-file-before-dhcp_do.patch b/SOURCES/0492-network-ifup-write-override-file-before-dhcp_do.patch index 442bdb4..be64457 100644 --- a/SOURCES/0492-network-ifup-write-override-file-before-dhcp_do.patch +++ b/SOURCES/0492-network-ifup-write-override-file-before-dhcp_do.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1415004 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index d7503c7..b5c9ad2 100755 +index d7503c7f..b5c9ad2a 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -374,6 +374,11 @@ for p in $(getargs ip=); do 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 index 368750a..2a0d9a2 100644 --- 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 @@ -11,7 +11,7 @@ devices. 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 +index a077da1c..fa395b3a 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 diff --git a/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch b/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch index 993f849..032aed2 100644 --- a/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch +++ b/SOURCES/0494-ifup-don-t-ifup-team-master-indefinitely.patch @@ -10,7 +10,7 @@ Thanks to martin.moore@hpe.com for the patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index b5c9ad2..f2b5894 100755 +index b5c9ad2a..f2b5894d 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -280,7 +280,7 @@ if [ -z "$NO_TEAM_MASTER" ]; 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 index 69d4203..cb011a2 100644 --- a/SOURCES/0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch +++ b/SOURCES/0495-95ssh-client-attempt-to-copy-UserKnownHostsFile-to-k.patch @@ -18,7 +18,7 @@ Resolves: #1360131 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 +index 6b441075..743de988 100755 --- a/modules.d/95ssh-client/module-setup.sh +++ b/modules.d/95ssh-client/module-setup.sh @@ -44,10 +44,17 @@ inst_sshenv() 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 index ff630f3..653db48 100644 --- 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 @@ -14,7 +14,7 @@ Resolves: #1460707 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 +index e0f2e381..13cafc2a 100755 --- a/modules.d/95udev-rules/module-setup.sh +++ b/modules.d/95udev-rules/module-setup.sh @@ -27,6 +27,7 @@ install() { 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 index 4065d07..da000a6 100644 --- 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 @@ -11,7 +11,7 @@ Resolves: #1396865 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 +index c12531e2..5822556b 100755 --- a/modules.d/98systemd/dracut-initqueue.sh +++ b/modules.d/98systemd/dracut-initqueue.sh @@ -68,7 +68,11 @@ while :; do 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 index 8308ae0..d2fc116 100644 --- 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 @@ -22,7 +22,7 @@ Resolves: #1459277 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 +index 7d9d369a..0a414eaf 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -64,6 +64,7 @@ installkernel() { 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 index 347a72d..deb6242 100644 --- 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 @@ -17,7 +17,7 @@ Resolves: #1459277 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 +index 0a414eaf..c4bf5af5 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -52,13 +52,14 @@ installkernel() { diff --git a/SOURCES/0500-fips-add-cmac-kernel-module.patch b/SOURCES/0500-fips-add-cmac-kernel-module.patch index ee20396..99506f5 100644 --- a/SOURCES/0500-fips-add-cmac-kernel-module.patch +++ b/SOURCES/0500-fips-add-cmac-kernel-module.patch @@ -11,7 +11,7 @@ Resolves: rhbz#1460865 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 +index d553a8c1..bd0078d4 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -21,7 +21,7 @@ installkernel() { diff --git a/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch b/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch index 39df399..7c520c4 100644 --- a/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch +++ b/SOURCES/0501-95iscsi-run-iscsistart-with-DefaultDependencies-no.patch @@ -11,7 +11,7 @@ Resolves: #1461234 1 file changed, 1 insertion(+) diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh -index ce8f547..4cf3d35 100755 +index ce8f5479..4cf3d355 100755 --- a/modules.d/95iscsi/iscsiroot.sh +++ b/modules.d/95iscsi/iscsiroot.sh @@ -182,6 +182,7 @@ handle_netroot() diff --git a/SOURCES/0502-01fips-add-authenec-module.patch b/SOURCES/0502-01fips-add-authenec-module.patch index 6a9f2dc..dbf089a 100644 --- a/SOURCES/0502-01fips-add-authenec-module.patch +++ b/SOURCES/0502-01fips-add-authenec-module.patch @@ -9,7 +9,7 @@ Resolves: #1465946 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 +index bd0078d4..ff72bb9b 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -21,7 +21,7 @@ installkernel() { diff --git a/SOURCES/0503-fips-honor-BOOT_IMAGE-variable-for-HMAC-check-of-the.patch b/SOURCES/0503-fips-honor-BOOT_IMAGE-variable-for-HMAC-check-of-the.patch new file mode 100644 index 0000000..4536446 --- /dev/null +++ b/SOURCES/0503-fips-honor-BOOT_IMAGE-variable-for-HMAC-check-of-the.patch @@ -0,0 +1,40 @@ +From 17092b128ce6900e0600dbdaf4ac9c777af0db2e Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 30 Jan 2017 09:20:55 +0100 +Subject: [PATCH] fips: honor $BOOT_IMAGE variable for HMAC check of the kernel + +https://bugzilla.redhat.com/show_bug.cgi?id=1415032 + +Cherry-picked from: 4693daa5fa7dddc6b35825831f35657cb66bd531 +Resolves: #1415032 +--- + modules.d/01fips/fips.sh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index 0b69a823..e9ed00b5 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -79,9 +79,10 @@ do_fips() + local _module + + KERNEL=$(uname -r) +- +- if ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then +- warn "/boot/.vmlinuz-${KERNEL}.hmac does not exist" ++ BOOT_IMAGE="$(getarg BOOT_IMAGE)" ++ BOOT_IMAGE="${BOOT_IMAGE:-/vmlinuz-${KERNEL}}" ++ if ! [ -e "/boot/.${BOOT_IMAGE}.hmac" ] && ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then ++ warn "/boot/.${BOOT_IMAGE}.hmac does not exist" + return 1 + fi + +@@ -116,7 +117,7 @@ do_fips() + elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then + do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 + else +- sha512hmac -c "/boot/.vmlinuz-${KERNEL}.hmac" || return 1 ++ sha512hmac -c "/boot/.${BOOT_IMAGE}.hmac" || return 1 + fi + + info "All initrd crypto checks done" diff --git a/SOURCES/0504-Try-BOOT_IMAGE-and-fallback-to-vmlinuz-KERNEL.patch b/SOURCES/0504-Try-BOOT_IMAGE-and-fallback-to-vmlinuz-KERNEL.patch new file mode 100644 index 0000000..2516576 --- /dev/null +++ b/SOURCES/0504-Try-BOOT_IMAGE-and-fallback-to-vmlinuz-KERNEL.patch @@ -0,0 +1,47 @@ +From 744afe75315b975a7eb431d0a52f6056353bf8f1 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 29 Jun 2017 10:38:09 +0200 +Subject: [PATCH] Try BOOT_IMAGE and fallback to vmlinuz-${KERNEL} + +On s390 BOOT_IMAGE only denotes the number of the boot record that +was selected in the bootloader and not the path to the kernel image. + +Also only bail out, if the kernel hmac checking relies on that path. + +Cherry-picked from: 3d875f77f3d1c5e4161794ca59025bc6bcd77eaa +Resolves: #1415032 +--- + modules.d/01fips/fips.sh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index e9ed00b5..ecd711c2 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -79,12 +79,6 @@ do_fips() + local _module + + KERNEL=$(uname -r) +- BOOT_IMAGE="$(getarg BOOT_IMAGE)" +- BOOT_IMAGE="${BOOT_IMAGE:-/vmlinuz-${KERNEL}}" +- if ! [ -e "/boot/.${BOOT_IMAGE}.hmac" ] && ! [ -e "/boot/.vmlinuz-${KERNEL}.hmac" ]; then +- warn "/boot/.${BOOT_IMAGE}.hmac does not exist" +- return 1 +- fi + + FIPSMODULES=$(cat /etc/fipsmodules) + +@@ -117,6 +111,13 @@ do_fips() + elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then + do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 + else ++ BOOT_IMAGE="$(getarg BOOT_IMAGE)" ++ [ -e "/boot/.${BOOT_IMAGE}.hmac" ] || BOOT_IMAGE="vmlinuz-${KERNEL}" ++ ++ if ! [ -e "/boot/.${BOOT_IMAGE}.hmac" ]; then ++ warn "/boot/.${BOOT_IMAGE}.hmac does not exist" ++ return 1 ++ fi + sha512hmac -c "/boot/.${BOOT_IMAGE}.hmac" || return 1 + fi + diff --git a/SOURCES/0505-dracut.cmdline-remove-extra-from-ip-doc.patch b/SOURCES/0505-dracut.cmdline-remove-extra-from-ip-doc.patch new file mode 100644 index 0000000..4a1ea5d --- /dev/null +++ b/SOURCES/0505-dracut.cmdline-remove-extra-from-ip-doc.patch @@ -0,0 +1,24 @@ +From 8131fd3c1136cdc5bd21fb84dc3a477aa1fc0456 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 13 Jan 2016 09:17:40 +0100 +Subject: [PATCH] dracut.cmdline: remove extra ":" from ip= doc + +Cherry-picked from: 0a7d7f63106ce5a7f9869aacb21d0474621811e7 +Resolves: #1469997 +--- + dracut.cmdline.7.asc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc +index 16266381..45902fa9 100644 +--- a/dracut.cmdline.7.asc ++++ b/dracut.cmdline.7.asc +@@ -469,7 +469,7 @@ cannot be used in conjunction with the **ifname** argument for the + same . + ===================== + +-**ip=**____:[____]:____:____:____:____:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__:[:[____][:____]]:: ++**ip=**____:[____]:____:____:____:____:__{none|off|dhcp|on|any|dhcp6|auto6|ibft}__[:[____][:____]]:: + explicit network configuration. If you want do define a IPv6 address, put it + in brackets (e.g. [2001:DB8::1]). This parameter can be specified multiple + times. ____ is optional and is the address of the remote endpoint diff --git a/SOURCES/0506-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch b/SOURCES/0506-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch new file mode 100644 index 0000000..a52bb13 --- /dev/null +++ b/SOURCES/0506-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch @@ -0,0 +1,51 @@ +From 063d6acb7b7f636e5a5e0369170f91d8961ffcd3 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 8 Oct 2013 15:02:14 +0200 +Subject: [PATCH] 10i18n/parse-i18n.sh: parse rd.vconsole and rd.locale + +and removed systemd part, because parse-i18n.sh is not even installed in +systemd driven initramfs images. + +Cherry-picked from: 6c8fc6e377b94e26e6d03cddbf174cb27caad0a6 +Resolves: #1479325 +--- + modules.d/10i18n/parse-i18n.sh | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/modules.d/10i18n/parse-i18n.sh b/modules.d/10i18n/parse-i18n.sh +index 348c5bc8..416a7469 100755 +--- a/modules.d/10i18n/parse-i18n.sh ++++ b/modules.d/10i18n/parse-i18n.sh +@@ -19,24 +19,18 @@ inst_key_val() { + unset _value + } + +-inst_key_val '' /etc/vconsole.conf vconsole.keymap KEYMAP -d KEYTABLE +-inst_key_val '' /etc/vconsole.conf vconsole.font FONT -d SYSFONT +-inst_key_val '' /etc/vconsole.conf vconsole.font.map FONT_MAP -d CONTRANS +-inst_key_val '' /etc/vconsole.conf vconsole.font.unimap FONT_UNIMAP -d UNIMAP +-inst_key_val 1 /etc/vconsole.conf vconsole.font.unicode UNICODE vconsole.unicode +-inst_key_val '' /etc/vconsole.conf vconsole.keymap.ext EXT_KEYMAP ++inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap vconsole.keymap KEYMAP -d KEYTABLE ++inst_key_val '' /etc/vconsole.conf rd.vconsole.font vconsole.font FONT -d SYSFONT ++inst_key_val '' /etc/vconsole.conf rd.vconsole.font.map vconsole.font.map FONT_MAP -d CONTRANS ++inst_key_val '' /etc/vconsole.conf rd.vconsole.font.unimap vconsole.font.unimap FONT_UNIMAP -d UNIMAP ++inst_key_val 1 /etc/vconsole.conf rd.vconsole.font.unicode vconsole.font.unicode UNICODE vconsole.unicode ++inst_key_val '' /etc/vconsole.conf rd.vconsole.keymap.ext vconsole.keymap.ext EXT_KEYMAP + +-inst_key_val '' /etc/locale.conf locale.LANG LANG +-inst_key_val '' /etc/locale.conf locale.LC_ALL LC_ALL ++inst_key_val '' /etc/locale.conf rd.locale.LANG locale.LANG LANG ++inst_key_val '' /etc/locale.conf rd.locale.LC_ALL locale.LC_ALL LC_ALL + + if [ -f /etc/locale.conf ]; then + . /etc/locale.conf + export LANG + export LC_ALL + fi +- +-if [ -n "$DRACUT_SYSTEMD" ]; then +- rm -f -- /etc/udev/rules.d/10-console.rules +- rm -f -- /lib/udev/rules.d/10-console.rules +- rm -f -- /lib/udev/console_init +-fi diff --git a/SOURCES/0507-dracut.sh-introduce-no-hostonly-default-device-argum.patch b/SOURCES/0507-dracut.sh-introduce-no-hostonly-default-device-argum.patch new file mode 100644 index 0000000..38a6229 --- /dev/null +++ b/SOURCES/0507-dracut.sh-introduce-no-hostonly-default-device-argum.patch @@ -0,0 +1,80 @@ +From 0e842c4b8b2796b9ae606da81ec92839af1cc27e Mon Sep 17 00:00:00 2001 +From: Xunlei Pang +Date: Wed, 16 Aug 2017 13:55:17 +0800 +Subject: [PATCH] dracut.sh: introduce "--no-hostonly-default-device" argument + +Kdump doesn't need default host devices like root, swap, fstab, etc, +we only care about the dump target which can be added via "--mount" +or "--add-device". We met several issues that kdump kernel failed +due to one of those host devices added by dracut, additionally, the +needless devices(e.g. LVM) consume some appreciable amount of memory +which is more likely to cause OOM under memory-limited kdump. + +So this patch introduced "--no-hostonly-default-device" to avoid +adding those default devices as host_devs. + +Signed-off-by: Xunlei Pang + +Cherry-picked from: 37f2fe55d +Resolves: #1483838 +--- + dracut.8.asc | 4 ++++ + dracut.sh | 9 ++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/dracut.8.asc b/dracut.8.asc +index 8fd863b9..e097e769 100644 +--- a/dracut.8.asc ++++ b/dracut.8.asc +@@ -306,6 +306,10 @@ provide a valid _/etc/fstab_. + **--no-hostonly-cmdline**: + Do not store kernel command line arguments needed in the initramfs + ++**--no-hostonly-default-device**: ++ Do not generate implicit host devices like root, swap, fstab, etc. ++ Use "--mount" or "--add-device" to explicitly add devices as needed. ++ + **--hostonly-i18n**: + Install only needed keyboard and font files according to the host configuration (default). + +diff --git a/dracut.sh b/dracut.sh +index f4e85095..0b23a838 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -141,6 +141,10 @@ Creates initial ramdisk images for preloading modules + in the initramfs + --no-hostonly-cmdline Do not store kernel command line arguments needed + in the initramfs ++ --no-hostonly-default-device ++ Do not generate implicit host devices like root, ++ swap, fstab, etc. Use "--mount" or "--add-device" ++ to explicitly add devices as needed. + --hostonly-i18n Install only needed keyboard and font files according + to the host configuration (default). + --no-hostonly-i18n Install all keyboard and font files available. +@@ -357,6 +361,7 @@ rearrange_params() + --long no-host-only \ + --long hostonly-cmdline \ + --long no-hostonly-cmdline \ ++ --long no-hostonly-default-device \ + --long persistent-policy: \ + --long fstab \ + --long help \ +@@ -545,6 +550,8 @@ while :; do + i18n_install_all_l="yes" ;; + --no-hostonly-cmdline) + hostonly_cmdline_l="no" ;; ++ --no-hostonly-default-device) ++ hostonly_default_device="no" ;; + --persistent-policy) + persistent_policy_l="$2"; PARMS_TO_STORE+=" '$2'"; shift;; + --fstab) use_fstab_l="yes" ;; +@@ -1039,7 +1046,7 @@ if (( ${#add_device_l[@]} )); then + done + fi + +-if [[ $hostonly ]]; then ++if [[ $hostonly ]] && [[ "$hostonly_default_device" != "no" ]]; then + # in hostonly mode, determine all devices, which have to be accessed + # and examine them for filesystem types + diff --git a/SOURCES/0508-rootfs-block-module-setup.sh-check-root_dev-in-cmdli.patch b/SOURCES/0508-rootfs-block-module-setup.sh-check-root_dev-in-cmdli.patch new file mode 100644 index 0000000..d021f84 --- /dev/null +++ b/SOURCES/0508-rootfs-block-module-setup.sh-check-root_dev-in-cmdli.patch @@ -0,0 +1,29 @@ +From e2afcc958be19287bc23d9c0a052b5ac57bb3df3 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 26 Oct 2017 13:50:17 +0200 +Subject: [PATCH] rootfs-block/module-setup.sh: check root_dev in + cmdline_rootfs() + +In case of "--no-hostonly-default-device", we do not need +the root device, thus add this check. + +Reimplementation of upstream commit 5634a31156070487210a8e362e8f088c5c4dc615 + +Resolves: #1483838 +--- + modules.d/95rootfs-block/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh +index 5bb704a4..284cb550 100755 +--- a/modules.d/95rootfs-block/module-setup.sh ++++ b/modules.d/95rootfs-block/module-setup.sh +@@ -32,7 +32,7 @@ cmdline_journal() { + + cmdline() { + local dev=/dev/block/$(find_root_block_device) +- if [ -e $dev ]; then ++ if [ -e $dev ] && [ -n "$root_dev" ] ; then + printf " root=%s" "$(shorten_persistent_dev "$(get_persistent_dev "$dev")")" + printf " rootflags=%s" "$(find_mp_fsopts /)" + printf " rootfstype=%s" "$(find_mp_fstype /)" diff --git a/SOURCES/0509-dracut.sh-gather-host_modalias-when-no-hostonly-defa.patch b/SOURCES/0509-dracut.sh-gather-host_modalias-when-no-hostonly-defa.patch new file mode 100644 index 0000000..2b9b501 --- /dev/null +++ b/SOURCES/0509-dracut.sh-gather-host_modalias-when-no-hostonly-defa.patch @@ -0,0 +1,27 @@ +From 0489607bf69ce521e1409e902380f3e168eeb302 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Fri, 27 Oct 2017 14:36:26 +0200 +Subject: [PATCH] dracut.sh: gather host_modalias when + "--no-hostonly-default-device" is set + +rhel-only +Related: #1483838 +--- + dracut.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dracut.sh b/dracut.sh +index 0b23a838..1dd3eabd 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1121,8 +1121,10 @@ if [[ $hostonly ]] && [[ "$hostonly_default_device" != "no" ]]; then + [[ -b $_dev ]] && push host_devs "$_dev" + done < /etc/fstab + fi ++fi + + ++if [[ $hostonly ]]; then + # record all host modaliases + declare -A host_modalias + find /sys/devices/ -name uevent -print > "$initdir/.modalias" diff --git a/SOURCES/0510-Add-NTFS-support-to-90dmsquash-live-module.patch b/SOURCES/0510-Add-NTFS-support-to-90dmsquash-live-module.patch new file mode 100644 index 0000000..3e45f93 --- /dev/null +++ b/SOURCES/0510-Add-NTFS-support-to-90dmsquash-live-module.patch @@ -0,0 +1,70 @@ +From 015d5aee92d461ce44d8b8cf941fb45855c13c3b Mon Sep 17 00:00:00 2001 +From: Robert Scheck +Date: Tue, 22 Aug 2017 23:44:41 +0200 +Subject: [PATCH] Add NTFS support to 90dmsquash-live module + +Support booting from USB media with NTFS filesystem (optionally), +which removes the FAT32 related 4 GB file size limit for LiveOS/ +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 ++++++++++++++- + 2 files changed, 36 insertions(+), 1 deletion(-) + create mode 100755 modules.d/90dmsquash-live-ntfs/module-setup.sh + +diff --git a/modules.d/90dmsquash-live-ntfs/module-setup.sh b/modules.d/90dmsquash-live-ntfs/module-setup.sh +new file mode 100755 +index 00000000..bc77376b +--- /dev/null ++++ b/modules.d/90dmsquash-live-ntfs/module-setup.sh +@@ -0,0 +1,22 @@ ++#!/bin/bash ++ ++command -v ++ ++check() { ++ require_binaries ntfs-3g || return 1 ++ return 255 ++} ++ ++depends() { ++ echo 90dmsquash-live ++ return 0 ++} ++ ++install() { ++ inst_multiple fusermount ulockmgr_server mount.fuse ntfs-3g ++ dracut_need_initqueue ++} ++ ++installkernel() { ++ hostonly='' instmods fuse ++} +diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh +index 6631d9a8..5fb798c7 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -79,7 +79,20 @@ if [ -f $livedev ]; then + esac + [ -e /sys/fs/$fstype ] || modprobe $fstype + else +- mount -n -t $fstype -o ${liverw:-ro} $livedev /run/initramfs/live ++ if [ "$(blkid -o value -s TYPE $livedev)" != "ntfs" ]; then ++ mount -n -t $fstype -o ${liverw:-ro} $livedev /run/initramfs/live ++ else ++ # Symlinking /usr/bin/ntfs-3g as /sbin/mount.ntfs seems to boot ++ # at the first glance, but ends with lots and lots of squashfs ++ # errors, because systemd attempts to kill the ntfs-3g process?! ++ if [ -x "$(find_binary "ntfs-3g")" ]; then ++ ( exec -a @ntfs-3g ntfs-3g -o ${liverw:-ro} $livedev /run/initramfs/live ) | vwarn ++ else ++ die "Failed to mount block device of live image: Missing NTFS support" ++ exit 1 ++ fi ++ fi ++ + if [ "$?" != "0" ]; then + die "Failed to mount block device of live image" + exit 1 diff --git a/SOURCES/0511-add-90multipath-hostonly-module.patch b/SOURCES/0511-add-90multipath-hostonly-module.patch new file mode 100644 index 0000000..a72c814 --- /dev/null +++ b/SOURCES/0511-add-90multipath-hostonly-module.patch @@ -0,0 +1,129 @@ +From 6ef3173e86c2be99b504f7c7a789dea5c0072f64 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 10 Jul 2017 13:28:40 +0200 +Subject: [PATCH] add 90multipath-hostonly module + +hardcoding the wwid of the drives in the initramfs causes problems +when the drives are cloned to a system with the same hardware, but +different disk wwid's + +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 ------------- + 2 files changed, 53 insertions(+), 26 deletions(-) + create mode 100755 modules.d/90multipath-hostonly/module-setup.sh + +diff --git a/modules.d/90multipath-hostonly/module-setup.sh b/modules.d/90multipath-hostonly/module-setup.sh +new file mode 100755 +index 00000000..88839033 +--- /dev/null ++++ b/modules.d/90multipath-hostonly/module-setup.sh +@@ -0,0 +1,53 @@ ++#!/bin/bash ++ ++# called by dracut ++check() { ++ return 255 ++} ++ ++# called by dracut ++depends() { ++ echo multipath ++ return 0 ++} ++ ++# called by dracut ++install() { ++ local _f _allow ++ ++ is_mpath() { ++ local _dev=$1 ++ [ -e /sys/dev/block/$_dev/dm/uuid ] || return 1 ++ [[ $(cat /sys/dev/block/$_dev/dm/uuid) =~ mpath- ]] && return 0 ++ return 1 ++ } ++ ++ majmin_to_mpath_dev() { ++ local _dev ++ for i in /dev/mapper/*; do ++ [[ $i == /dev/mapper/control ]] && continue ++ _dev=$(get_maj_min $i) ++ if [ "$_dev" = "$1" ]; then ++ echo $i ++ return ++ fi ++ done ++ } ++ ++ add_hostonly_mpath_conf() { ++ is_mpath $1 && { ++ local _dev ++ ++ _dev=$(majmin_to_mpath_dev $1) ++ [ -z "$_dev" ] && return ++ strstr "$_allow" "$_dev" && return ++ _allow="$_allow --allow $_dev" ++ } ++ } ++ ++ [[ $hostonly ]] && { ++ for_each_host_dev_and_slaves_all add_hostonly_mpath_conf ++ [ -n "$_allow" ] && mpathconf $_allow --outfile ${initdir}/etc/multipath.conf ++ } ++} ++ +diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh +index 3983b7b7..232ddcd8 100755 +--- a/modules.d/90multipath/module-setup.sh ++++ b/modules.d/90multipath/module-setup.sh +@@ -9,17 +9,6 @@ is_mpath() { + return 1 + } + +-majmin_to_mpath_dev() { +- local _dev +- for i in /dev/mapper/*; do +- [[ $i == /dev/mapper/control ]] && continue +- _dev=$(get_maj_min $i) +- if [ "$_dev" = "$1" ]; then +- echo $i +- return +- fi +- done +-} + + check() { + local _rootdev +@@ -81,16 +70,6 @@ installkernel() { + + install() { + local _f _allow +- add_hostonly_mpath_conf() { +- is_mpath $1 && { +- local _dev +- +- _dev=$(majmin_to_mpath_dev $1) +- [ -z "$_dev" ] && return +- strstr "$_allow" "$_dev" && return +- _allow="$_allow --allow $_dev" +- } +- } + + inst_multiple -o \ + dmsetup \ +@@ -105,11 +84,6 @@ install() { + /etc/multipath.conf \ + /etc/multipath/* + +- [[ $hostonly ]] && { +- for_each_host_dev_and_slaves_all add_hostonly_mpath_conf +- [ -n "$_allow" ] && mpathconf $_allow --outfile ${initdir}/etc/multipath.conf +- } +- + inst $(command -v partx) /sbin/partx + + inst_libdir_file "libmultipath*" "multipath/*" diff --git a/SOURCES/0512-spec-add-missing-modules.patch b/SOURCES/0512-spec-add-missing-modules.patch new file mode 100644 index 0000000..88619fb --- /dev/null +++ b/SOURCES/0512-spec-add-missing-modules.patch @@ -0,0 +1,28 @@ +From fe89c8f9df77f49e13732debdc99f88753b145e6 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Tue, 25 Jul 2017 10:31:55 +0900 +Subject: [PATCH] spec: add missing modules + +Cherry-picked from: ad3b209d409cee337b33cbede4101aa06727ce06 +Resolves: #1457311 +--- + dracut.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dracut.spec b/dracut.spec +index bf10d08b..ee12013b 100644 +--- a/dracut.spec ++++ b/dracut.spec +@@ -346,10 +346,12 @@ rm -rf -- $RPM_BUILD_ROOT + %{dracutlibdir}/modules.d/90dm + %{dracutlibdir}/modules.d/90dmraid + %{dracutlibdir}/modules.d/90dmsquash-live ++%{dracutlibdir}/modules.d/90dmsquash-live-ntfs + %{dracutlibdir}/modules.d/90kernel-modules + %{dracutlibdir}/modules.d/90lvm + %{dracutlibdir}/modules.d/90mdraid + %{dracutlibdir}/modules.d/90multipath ++%{dracutlibdir}/modules.d/90multipath-hostonly + %{dracutlibdir}/modules.d/90qemu + %{dracutlibdir}/modules.d/91crypt-gpg + %{dracutlibdir}/modules.d/91crypt-loop diff --git a/SOURCES/0513-lvm_scan.sh-use-K-when-calling-lvchange.patch b/SOURCES/0513-lvm_scan.sh-use-K-when-calling-lvchange.patch new file mode 100644 index 0000000..1057b45 --- /dev/null +++ b/SOURCES/0513-lvm_scan.sh-use-K-when-calling-lvchange.patch @@ -0,0 +1,46 @@ +From 0fe8ed5ccb19cf5fc4a55af1b44a6664c971b5af Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Wed, 26 Apr 2017 14:15:15 +0100 +Subject: [PATCH] lvm_scan.sh: use -K when calling lvchange + +The --ignoreactivationskip/-K switch was added to LVM2 in 2.02.99 +(July 2013) and is used to control the activation of volumes with +the activation skip flag set: without -K these volumes will be +ignored when 'lvchange -ay $LV' is issued. + +This prevents an LVM2 thin-privisioned snapshot from being used +as the root device when booting with rd.lvm.lv=vg/lv since the +activation skip flag is set for these snapshots by default (the +legacy non-thinp snapshots do not set this flag and can already +be activated and used as a root device by specifying appropriate +values for rd.lvm.lv). + +This is only used in the rd.lvm.lv case since in that situation +we are activating one or more named LVs specified by the user: +the flag is not given when calling 'vgchange' since this may +cause many unwanted volumes to be activated during early user +space. Users wishing to use a specific snapshot volume should +specify it with 'rd.lvm.lv'. + +Cherry-picked from: cc4e507322952532e629b98fc4de8fc1afd3ba80 +Resolves: #1489841 +--- + modules.d/90lvm/lvm_scan.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh +index ae6f177b..0d5fff71 100755 +--- a/modules.d/90lvm/lvm_scan.sh ++++ b/modules.d/90lvm/lvm_scan.sh +@@ -109,9 +109,9 @@ if [ -n "$LVS" ] ; then + lvm lvscan --ignorelockingfailure 2>&1 | vinfo + for LV in $LVS; do + if [ -z "$sysinit" ]; then +- lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo ++ lvm lvchange --yes -K -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo + else +- lvm lvchange --yes -ay $sysinit $LV 2>&1 | vinfo ++ lvm lvchange --yes -K -ay $sysinit $LV 2>&1 | vinfo + fi + done + fi diff --git a/SOURCES/0514-fcoe-Allow-more-time-for-the-bnx2x-link-negotiation-.patch b/SOURCES/0514-fcoe-Allow-more-time-for-the-bnx2x-link-negotiation-.patch new file mode 100644 index 0000000..a1680b6 --- /dev/null +++ b/SOURCES/0514-fcoe-Allow-more-time-for-the-bnx2x-link-negotiation-.patch @@ -0,0 +1,35 @@ +From 3d1c9a76e7f0147feb65bd627583205d3a719ed0 Mon Sep 17 00:00:00 2001 +From: Chad Dupuis +Date: Wed, 12 Oct 2016 11:32:47 -0400 +Subject: [PATCH] fcoe: Allow more time for the bnx2x link negotiation before + brining up fcoe interfaces. + +bnx2x can take no longer than 3 seconds to initialize the link in some setups +which can cause fipvlan to fail and thus the fcoe interface(s) won't be +created. + +Add another 10 seconds to give the link enough time to initialize. + +Signed-off-by: Chad Dupuis + +Cherry-picked from: 3966a1e1ee0e3d27197258f446f54b683c415208 +Resolves: #1378910 +--- + modules.d/95fcoe/fcoe-up.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh +index cdff6ef1..a1f04747 100755 +--- a/modules.d/95fcoe/fcoe-up.sh ++++ b/modules.d/95fcoe/fcoe-up.sh +@@ -87,8 +87,8 @@ elif [ "$netdriver" = "bnx2x" ]; then + # If driver is bnx2x, do not use /sys/module/fcoe/parameters/create but fipvlan + modprobe 8021q + udevadm settle --timeout=30 +- # Sleep for 3 s to allow dcb negotiation +- sleep 3 ++ # Sleep for 13 s to allow dcb negotiation ++ sleep 13 + fipvlan "$netif" -c -s + else + vlan="no" diff --git a/SOURCES/0515-add-mtu-parameter-for-bond-options.patch b/SOURCES/0515-add-mtu-parameter-for-bond-options.patch new file mode 100644 index 0000000..6a36c3a --- /dev/null +++ b/SOURCES/0515-add-mtu-parameter-for-bond-options.patch @@ -0,0 +1,75 @@ +From 50d75a50fbebf96fe2937352aa2ea10e467b7ebd Mon Sep 17 00:00:00 2001 +From: Imran Haider +Date: Mon, 16 May 2016 00:14:58 -0400 +Subject: [PATCH] add 'mtu' parameter for bond options + +Signed-off-by: Imran Haider + +Cherry-picked from: 292548be6ec8e701dab1a532ca072707e890b12e +Resolves: #1494265 +--- + modules.d/40network/ifup.sh | 3 +++ + modules.d/40network/parse-bond.sh | 9 +++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index f2b5894d..38c7b709 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -249,6 +249,9 @@ if [ -z "$NO_BOND_MASTER" ]; then + linkup $slave + done + ++ # Set mtu on bond master ++ [ -n "$bondmtu" ] && ip link set mtu $bondmtu dev $netif ++ + # add the bits to setup the needed post enslavement parameters + for arg in $bondoptions ; do + key=${arg%%=*}; +diff --git a/modules.d/40network/parse-bond.sh b/modules.d/40network/parse-bond.sh +index 80b3b077..48e548b9 100755 +--- a/modules.d/40network/parse-bond.sh ++++ b/modules.d/40network/parse-bond.sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # + # Format: +-# bond=[::[:]] ++# bond=[::[:[:]]] + # + # bondslaves is a comma-separated list of physical (ethernet) interfaces + # options is a comma-separated list on bonding options (modinfo bonding for details) in format compatible with initscripts +@@ -9,6 +9,8 @@ + # + # bond without parameters assumes bond=bond0:eth0,eth1:mode=balance-rr + # ++# if the mtu is specified, it will be set on the bond master ++# + + # We translate list of slaves to space-separated here to mwke it easier to loop over them in ifup + # Ditto for bonding options +@@ -25,15 +27,17 @@ parsebond() { + 1) bondname=$1; bondslaves="eth0 eth1" ;; + 2) bondname=$1; bondslaves=$(str_replace "$2" "," " ") ;; + 3) bondname=$1; bondslaves=$(str_replace "$2" "," " "); bondoptions=$(str_replace "$3" "," " ") ;; ++ 4) bondname=$1; bondslaves=$(str_replace "$2" "," " "); bondoptions=$(str_replace "$3" "," " "); bondmtu=$4;; + *) die "bond= requires zero to four parameters" ;; + esac + } + +-# Parse bond for bondname, bondslaves, bondmode and bondoptions ++# Parse bond for bondname, bondslaves, bondmode, bondoptions and bondmtu + for bond in $(getargs bond=); do + unset bondname + unset bondslaves + unset bondoptions ++ unset bondmtu + if [ "$bond" != "bond" ]; then + parsebond "$bond" + fi +@@ -47,4 +51,5 @@ for bond in $(getargs bond=); do + echo "bondname=$bondname" > /tmp/bond.${bondname}.info + echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.${bondname}.info + echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.${bondname}.info ++ echo "bondmtu=\"$bondmtu\"" >> /tmp/bond.${bondname}.info + done diff --git a/SOURCES/0516-Fix-MTU-on-bond-interface.patch b/SOURCES/0516-Fix-MTU-on-bond-interface.patch new file mode 100644 index 0000000..09cd3a4 --- /dev/null +++ b/SOURCES/0516-Fix-MTU-on-bond-interface.patch @@ -0,0 +1,30 @@ +From 50c3405ce0a62439708c51be949f275d2714d887 Mon Sep 17 00:00:00 2001 +From: Robert LeBlanc +Date: Thu, 21 Sep 2017 14:33:59 -0600 +Subject: [PATCH] Fix MTU on bond interface. + +The MTU is only being set on the slave devices and the MTU of the +bonding master is not being updated. This updates the bonding master and +also changes the MTU on the slaves as expected. + +Signed-Off-By: Robert LeBlanc + +Cherry-picked from: d0eabcab43f2c47ca38dba41453f97c6a7d362fc +Resolves: #1494265 +--- + modules.d/40network/ifup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index 38c7b709..b3219fc1 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -250,7 +250,7 @@ if [ -z "$NO_BOND_MASTER" ]; then + done + + # Set mtu on bond master +- [ -n "$bondmtu" ] && ip link set mtu $bondmtu dev $netif ++ [ -n "$bondmtu" ] && ip link set mtu $bondmtu dev $bondname + + # add the bits to setup the needed post enslavement parameters + for arg in $bondoptions ; do diff --git a/SOURCES/0517-dracut.sh-source-dracut-version.sh-earlier-than-drac.patch b/SOURCES/0517-dracut.sh-source-dracut-version.sh-earlier-than-drac.patch new file mode 100644 index 0000000..9ea9ad4 --- /dev/null +++ b/SOURCES/0517-dracut.sh-source-dracut-version.sh-earlier-than-drac.patch @@ -0,0 +1,43 @@ +From 75bf5df4209bec34799fb412d4c5bdd2b03e244d Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 20 Aug 2014 10:21:43 +0200 +Subject: [PATCH] dracut.sh: source dracut-version.sh earlier than + dracut-functions.sh + +Otherwise dracut-logger.sh outputs an empty version on journal testing. + +Aug 20 10:15:49 lenovo dracut[11144]: dracut- +Aug 20 10:15:49 lenovo dracut[11148]: Executing: /sbin/dracut + +Cherry-picked from: e27ecc9ae8352c98c206ea5165ab6b85d3d6cd3a +Resolves: #1490777 +--- + dracut.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 1dd3eabd..b34edea2 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -864,6 +864,10 @@ if [[ $print_cmdline ]]; then + kmsgloglvl=0 + fi + ++if [[ -f $dracutbasedir/dracut-version.sh ]]; then ++ . $dracutbasedir/dracut-version.sh ++fi ++ + if [[ -f $dracutbasedir/dracut-init.sh ]]; then + . $dracutbasedir/dracut-init.sh + else +@@ -882,10 +886,6 @@ if ! [[ $print_cmdline ]]; then + rm -fr -- ${initdir}/* + fi + +-if [[ -f $dracutbasedir/dracut-version.sh ]]; then +- . $dracutbasedir/dracut-version.sh +-fi +- + # Verify bash version, current minimum is 3.1 + if (( BASH_VERSINFO[0] < 4 )); then + dfatal 'You need at least Bash 4 to use dracut, sorry.' diff --git a/SOURCES/0518-network-Only-bring-up-wired-network-interfaces.patch b/SOURCES/0518-network-Only-bring-up-wired-network-interfaces.patch new file mode 100644 index 0000000..4ee4471 --- /dev/null +++ b/SOURCES/0518-network-Only-bring-up-wired-network-interfaces.patch @@ -0,0 +1,41 @@ +From 240c2fea10fda5c84a7725e8711d9cb214a064a9 Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Wed, 9 Aug 2017 18:50:44 +0200 +Subject: [PATCH] network: Only bring up wired network interfaces + +The dracut network module is only supposed to be used for wired interfaces +but if driver modules for wireless devices are wrongly copied, these will +be loaded and the available interfaces brought up. + +If the rd.neednet=1 command line parameter is used, dhclient will attempt +to request an IP address for the interfaces and these requests will fail. + +But other dracut modules that depend on the network to be settled, will +have to wait for the DHCP requests to timeout. Which can be a lot of time +since the dhclient default timeout value is 60 seconds. + +Instead of trying to blacklist all possible kernel modules for wireless +devices, only bring up network interfaces if these are for wired devices. + +Suggested-by: Harald Hoyer +Signed-off-by: Javier Martinez Canillas + +Cherry-picked from: 17927597213854b2fdf15461353882339fdb5051 +Resolves: #1480246 +--- + modules.d/40network/net-genrules.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh +index 08072fbe..c4396f77 100755 +--- a/modules.d/40network/net-genrules.sh ++++ b/modules.d/40network/net-genrules.sh +@@ -102,7 +102,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh + # Default: We don't know the interface to use, handle all + # Fixme: waiting for the interface as well. + else +- cond='ACTION=="add", SUBSYSTEM=="net"' ++ cond='ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}!="wlan|wwan"' + # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh + echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules + fi diff --git a/SOURCES/0519-network-ifup-don-t-arping-for-point-to-point-connect.patch b/SOURCES/0519-network-ifup-don-t-arping-for-point-to-point-connect.patch new file mode 100644 index 0000000..643960d --- /dev/null +++ b/SOURCES/0519-network-ifup-don-t-arping-for-point-to-point-connect.patch @@ -0,0 +1,32 @@ +From 0259f1c246d3c5b7cf9cb234571e025e529e8716 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 7 Aug 2017 15:09:13 +0200 +Subject: [PATCH] network/ifup: don't arping for point-to-point connections + +https://bugzilla.redhat.com/show_bug.cgi?id=1477339 + +Cherry-picked from: 5abd692fe46215c38f564b59db50193daf745af5 +Resolves: #1477339 +--- + modules.d/40network/ifup.sh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh +index b3219fc1..9ed48155 100755 +--- a/modules.d/40network/ifup.sh ++++ b/modules.d/40network/ifup.sh +@@ -118,9 +118,11 @@ do_static() { + ip addr add $ip/$mask ${srv:+peer $srv} dev $netif + wait_for_ipv6_dad $netif + else +- if ! arping -f -q -D -c 2 -I $netif $ip; then +- warn "Duplicate address detected for $ip for interface $netif." +- return 1 ++ if [ -z "$srv" ]; then ++ if ! arping -f -q -D -c 2 -I $netif $ip; then ++ warn "Duplicate address detected for $ip for interface $netif." ++ return 1 ++ fi + fi + ip -4 addr flush dev $netif + ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif diff --git a/SOURCES/0520-guard-arrays-with.patch b/SOURCES/0520-guard-arrays-with.patch new file mode 100644 index 0000000..052a35c --- /dev/null +++ b/SOURCES/0520-guard-arrays-with.patch @@ -0,0 +1,181 @@ +From 69b5de6251ab7dace7ed7eb8bea7a81324cefe16 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 9 Jul 2015 15:27:44 +0200 +Subject: [PATCH] guard ${arrays[@]} with "" + +Cherry-picked from: 3721635b2c5df033fca1e19181d7598e075f5308 +Resolves: #1520721 +--- + dracut-functions.sh | 8 ++++---- + dracut.sh | 6 +++--- + lsinitrd.sh | 2 +- + modules.d/90btrfs/module-setup.sh | 2 +- + modules.d/90kernel-modules/module-setup.sh | 2 +- + modules.d/95cifs/module-setup.sh | 2 +- + modules.d/95nfs/module-setup.sh | 2 +- + modules.d/95virtfs/module-setup.sh | 2 +- + modules.d/99base/module-setup.sh | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 3c4118a9..23768bdc 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -593,7 +593,7 @@ for_each_host_dev_fs() + local _dev + local _ret=1 + +- [[ "${!host_fs_types[@]}" ]] || return 0 ++ [[ "${#host_fs_types[@]}" ]] || return 0 + + for _dev in "${!host_fs_types[@]}"; do + $_func "$_dev" "${host_fs_types[$_dev]}" && _ret=0 +@@ -654,7 +654,7 @@ for_each_host_dev_and_slaves_all() + + [[ "${host_devs[@]}" ]] || return 0 + +- for _dev in ${host_devs[@]}; do ++ for _dev in "${host_devs[@]}"; do + [[ -b "$_dev" ]] || continue + if check_block_and_slaves_all $_func $(get_maj_min $_dev); then + _ret=0 +@@ -670,7 +670,7 @@ for_each_host_dev_and_slaves() + + [[ "${host_devs[@]}" ]] || return 0 + +- for _dev in ${host_devs[@]}; do ++ for _dev in "${host_devs[@]}"; do + [[ -b "$_dev" ]] || continue + check_block_and_slaves $_func $(get_maj_min $_dev) && return 0 + done +@@ -1241,7 +1241,7 @@ check_mount() { + local _ret + local _moddep + +- [ "${#host_fs_types[*]}" -le 0 ] && return 1 ++ [ "${#host_fs_types[@]}" -le 0 ] && return 1 + + # If we are already scheduled to be loaded, no need to check again. + [[ " $mods_to_load " == *\ $_mod\ * ]] && return 0 +diff --git a/dracut.sh b/dracut.sh +index b34edea2..90b75e51 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1171,7 +1171,7 @@ _get_fs_type() { + return 1 + } + +-for dev in ${host_devs[@]}; do ++for dev in "${host_devs[@]}"; do + _get_fs_type "$dev" + check_block_and_slaves_all _get_fs_type "$(get_maj_min "$dev")" + done +@@ -1396,8 +1396,8 @@ if [[ $no_kernel != yes ]]; then + fi + + if [[ $kernel_only != yes ]]; then +- (( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]} +- (( ${#install_optional_items[@]} > 0 )) && inst_multiple -o ${install_optional_items[@]} ++ (( ${#install_items[@]} > 0 )) && inst_multiple "${install_items[@]}" ++ (( ${#install_optional_items[@]} > 0 )) && inst_multiple -o "${install_optional_items[@]}" + + [[ $kernel_cmdline ]] && printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf" + +diff --git a/lsinitrd.sh b/lsinitrd.sh +index 4103ee23..0fb7e3b5 100755 +--- a/lsinitrd.sh ++++ b/lsinitrd.sh +@@ -113,7 +113,7 @@ fi + extract_files() + { + (( ${#filenames[@]} == 1 )) && nofileinfo=1 +- for f in ${!filenames[@]}; do ++ for f in "${!filenames[@]}"; do + [[ $nofileinfo ]] || echo "initramfs:/$f" + [[ $nofileinfo ]] || echo "========================================================================" + $CAT $image 2>/dev/null | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null +diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh +index 4804f58b..ac8cb885 100755 +--- a/modules.d/90btrfs/module-setup.sh ++++ b/modules.d/90btrfs/module-setup.sh +@@ -9,7 +9,7 @@ check() { + require_binaries btrfs || return 1 + + [[ $hostonly ]] || [[ $mount_needs ]] && { +- for fs in ${host_fs_types[@]}; do ++ for fs in "${host_fs_types[@]}"; do + [[ "$fs" == "btrfs" ]] && return 0 + done + return 255 +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index c4bf5af5..dea32602 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -83,7 +83,7 @@ installkernel() { + instmods '=fs' + fi + else +- for i in $(host_fs_all); do ++ for i in "${host_fs_types[@]}"; do + hostonly='' instmods $i + done + fi +diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh +index 9e36f87f..e2509504 100755 +--- a/modules.d/95cifs/module-setup.sh ++++ b/modules.d/95cifs/module-setup.sh +@@ -7,7 +7,7 @@ check() { + require_binaries mount.cifs || return 1 + + [[ $hostonly ]] || [[ $mount_needs ]] && { +- for fs in ${host_fs_types[@]}; do ++ for fs in "${host_fs_types[@]}"; do + [[ "$fs" == "cifs" ]] && return 0 + done + return 255 +diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh +index dc2e7221..b0bb866d 100755 +--- a/modules.d/95nfs/module-setup.sh ++++ b/modules.d/95nfs/module-setup.sh +@@ -8,7 +8,7 @@ check() { + require_binaries rpc.statd mount.nfs mount.nfs4 umount || return 1 + + [[ $hostonly ]] || [[ $mount_needs ]] && { +- for fs in ${host_fs_types[@]}; do ++ for fs in "${host_fs_types[@]}"; do + [[ "$fs" == "nfs" ]] && return 0 + [[ "$fs" == "nfs3" ]] && return 0 + [[ "$fs" == "nfs4" ]] && return 0 +diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh +index 3d80b75f..c7101c07 100755 +--- a/modules.d/95virtfs/module-setup.sh ++++ b/modules.d/95virtfs/module-setup.sh +@@ -4,7 +4,7 @@ + + check() { + [[ $hostonly ]] || [[ $mount_needs ]] && { +- for fs in ${host_fs_types[@]}; do ++ for fs in "${host_fs_types[@]}"; do + [[ "$fs" == "9p" ]] && return 0 + done + return 255 +diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh +index 8fd4e80d..74a3f0c0 100755 +--- a/modules.d/99base/module-setup.sh ++++ b/modules.d/99base/module-setup.sh +@@ -103,13 +103,13 @@ install() { + + . "$moddir/dracut-lib.sh" + +- for _dev in ${host_devs[@]}; do ++ for _dev in "${host_devs[@]}"; do + [[ "$_dev" == "$root_dev" ]] && continue + + # We only actually wait for real devs - swap is only needed + # for resume and udev rules generated when parsing resume= + # argument take care of the waiting for us +- for _dev2 in ${swap_devs[@]}; do ++ for _dev2 in "${swap_devs[@]}"; do + [[ "$_dev" == "$_dev2" ]] && continue 2 + done + diff --git a/SOURCES/0521-dracut.sh-for_each_host_xx-function-should-indicate-.patch b/SOURCES/0521-dracut.sh-for_each_host_xx-function-should-indicate-.patch new file mode 100644 index 0000000..48a6d9b --- /dev/null +++ b/SOURCES/0521-dracut.sh-for_each_host_xx-function-should-indicate-.patch @@ -0,0 +1,50 @@ +From 43d6b9d0085c393c7cdb0fd1f1181654d0f87e61 Mon Sep 17 00:00:00 2001 +From: Pingfan Liu +Date: Mon, 4 Dec 2017 17:24:11 +0800 +Subject: [PATCH] dracut.sh: for_each_host_xx() function should indicate the + empty case + +The caller of "for_each_host_xx func" needs to tell three cases: +func success/ fail / not be called. +E.g, in kdump case, host_devs can be empty, and we want to know it. + +Signed-off-by: Pingfan Liu + +Cherry-picked from: e6199960d9bbfe6d860a32716b7e9bac7e657a4f +Resolves: #1520721 +--- + dracut-functions.sh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 23768bdc..4051596b 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -593,7 +593,8 @@ for_each_host_dev_fs() + local _dev + local _ret=1 + +- [[ "${#host_fs_types[@]}" ]] || return 0 ++ [[ "${#host_fs_types[@]}" ]] || return 2 ++ + + for _dev in "${!host_fs_types[@]}"; do + $_func "$_dev" "${host_fs_types[$_dev]}" && _ret=0 +@@ -652,7 +653,7 @@ for_each_host_dev_and_slaves_all() + local _dev + local _ret=1 + +- [[ "${host_devs[@]}" ]] || return 0 ++ [[ "${host_devs[@]}" ]] || return 2 + + for _dev in "${host_devs[@]}"; do + [[ -b "$_dev" ]] || continue +@@ -668,7 +669,7 @@ for_each_host_dev_and_slaves() + local _func="$1" + local _dev + +- [[ "${host_devs[@]}" ]] || return 0 ++ [[ "${host_devs[@]}" ]] || return 2 + + for _dev in "${host_devs[@]}"; do + [[ -b "$_dev" ]] || continue diff --git a/SOURCES/0522-dracut.sh-remove-quotes-from-install_items-and-insta.patch b/SOURCES/0522-dracut.sh-remove-quotes-from-install_items-and-insta.patch new file mode 100644 index 0000000..f73fbb6 --- /dev/null +++ b/SOURCES/0522-dracut.sh-remove-quotes-from-install_items-and-insta.patch @@ -0,0 +1,29 @@ +From e076279d38466b974305fd38aae4a22e0bd9a90f Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 10 Aug 2015 14:05:15 +0200 +Subject: [PATCH] dracut.sh: remove quotes from install_items and + install_optional_items + +Unfortunately these are lists with whitespaces. + +Cherry-picked from: 3c00189988f6921c1affdd61a0f5025ee9b93bda +Resolves: #1520721 +--- + dracut.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 90b75e51..3b91b5e8 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1396,8 +1396,8 @@ if [[ $no_kernel != yes ]]; then + fi + + if [[ $kernel_only != yes ]]; then +- (( ${#install_items[@]} > 0 )) && inst_multiple "${install_items[@]}" +- (( ${#install_optional_items[@]} > 0 )) && inst_multiple -o "${install_optional_items[@]}" ++ (( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]} ++ (( ${#install_optional_items[@]} > 0 )) && inst_multiple -o ${install_optional_items[@]} + + [[ $kernel_cmdline ]] && printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf" + diff --git a/SOURCES/0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch b/SOURCES/0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch index 1dcbd84..77379d3 100644 --- a/SOURCES/0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch +++ b/SOURCES/0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch @@ -12,7 +12,7 @@ Resolves: #1476039 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index 4051596..ef52274 100755 +index 4051596b..ef52274f 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1739,7 +1739,11 @@ get_ucode_file () diff --git a/SOURCES/0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch b/SOURCES/0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch index 29586ac..bb45b93 100644 --- a/SOURCES/0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch +++ b/SOURCES/0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch @@ -12,7 +12,7 @@ Resolves: #1476039 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh -index ef52274..98a4b88 100755 +index ef52274f..98a4b88b 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1738,13 +1738,8 @@ get_ucode_file () diff --git a/SOURCES/0525-01fips-Fix-creating-path-to-.hmac-of-kernel-based-on.patch b/SOURCES/0525-01fips-Fix-creating-path-to-.hmac-of-kernel-based-on.patch new file mode 100644 index 0000000..9a89d3e --- /dev/null +++ b/SOURCES/0525-01fips-Fix-creating-path-to-.hmac-of-kernel-based-on.patch @@ -0,0 +1,49 @@ +From 9b1d79993dbed054c5069f97204280a39ed61219 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Mon, 18 Dec 2017 14:48:59 +0100 +Subject: [PATCH] 01fips: Fix creating path to .hmac of kernel based on + BOOT_IMAGE + +Old code did not work for two most common use-cases. +On most machines BOOT_IMAGE is set to something like +/vmlinuz-4.11.3-202.fc25.x86_64. So if we just add prefix "/boot/." +it won't work. Also on machines without /boot on separate partition +BOOT_IMAGE already has the /boot/ prefix (/boot/vmlinuz-3.10.0-799.el7.x86_64). +So let's strip it in such case. + +https://bugzilla.redhat.com/show_bug.cgi?id=1415032 + +Cherry-picked from: 8f5c564cb30966878b0d90025568253016e1402f +Resolves: #1415032 +--- + modules.d/01fips/fips.sh | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index ecd711c2..6c5dd60f 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -112,13 +112,19 @@ do_fips() + do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 + else + BOOT_IMAGE="$(getarg BOOT_IMAGE)" +- [ -e "/boot/.${BOOT_IMAGE}.hmac" ] || BOOT_IMAGE="vmlinuz-${KERNEL}" ++ if ! [ -e "/boot/${BOOT_IMAGE}" ]; then ++ #if /boot is not a separate partition BOOT_IMAGE might start with /boot ++ BOOT_IMAGE=${BOOT_IMAGE#"/boot"} ++ [ -e "/boot/${BOOT_IMAGE}" ] || BOOT_IMAGE="vmlinuz-${KERNEL}" ++ fi ++ ++ BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE%/*}/.${BOOT_IMAGE##*/}.hmac" + +- if ! [ -e "/boot/.${BOOT_IMAGE}.hmac" ]; then +- warn "/boot/.${BOOT_IMAGE}.hmac does not exist" ++ if ! [ -e "${BOOT_IMAGE_HMAC}" ]; then ++ warn "${BOOT_IMAGE_HMAC} does not exist" + return 1 + fi +- sha512hmac -c "/boot/.${BOOT_IMAGE}.hmac" || return 1 ++ sha512hmac -c "${BOOT_IMAGE_HMAC}" || return 1 + fi + + info "All initrd crypto checks done" diff --git a/SOURCES/0526-01fips-Properly-fix-creating-path-to-.hmac-of-kernel.patch b/SOURCES/0526-01fips-Properly-fix-creating-path-to-.hmac-of-kernel.patch new file mode 100644 index 0000000..eb0c6a1 --- /dev/null +++ b/SOURCES/0526-01fips-Properly-fix-creating-path-to-.hmac-of-kernel.patch @@ -0,0 +1,63 @@ +From 69a889ee675822102d04e99a25bdc92aa977263a Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Tue, 26 Dec 2017 12:18:47 +0100 +Subject: [PATCH] 01fips: Properly fix creating path to .hmac of kernel based + on BOOT_IMAGE + +8f5c5 broke the case where BOOT_IMAGE is not set at all. +This code should handle following: +1) BOOT_IMAGE not set +2) BOOT_IMAGE set to something unrelated (s390) +3) BOOT_IMAGE=vmlinuz-4.14.7-300.fc27.x86_64 +4) BOOT_IMAGE=/vmlinuz-4.14.7-300.fc27.x86_64 +5) BOOT_IMAGE=/boot/vmlinuz-4.14.7-300.fc27.x86_64 +6) BOOT_IMAGE=subdir/vmlinuz-4.14.7-300.fc27.x86_64 +7) BOOT_IMAGE=/subdir/vmlinuz-4.14.7-300.fc27.x86_64 +8) BOOT_IMAGE=/boot/subdir/vmlinuz-4.14.7-300.fc27.x86_64 + +https://bugzilla.redhat.com/show_bug.cgi?id=1415032 + +Cherry-picked from: d818986db485fc57a76a247a8475c3144acd33dc +Resolves: #1415032 +--- + modules.d/01fips/fips.sh | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh +index 6c5dd60f..c72c1273 100755 +--- a/modules.d/01fips/fips.sh ++++ b/modules.d/01fips/fips.sh +@@ -112,18 +112,28 @@ do_fips() + do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 + else + BOOT_IMAGE="$(getarg BOOT_IMAGE)" +- if ! [ -e "/boot/${BOOT_IMAGE}" ]; then ++ BOOT_IMAGE_NAME="${BOOT_IMAGE##*/}" ++ BOOT_IMAGE_PATH="${BOOT_IMAGE%${BOOT_IMAGE_NAME}}" ++ ++ if [ -z "$BOOT_IMAGE_NAME" ]; then ++ BOOT_IMAGE_NAME="vmlinuz-${KERNEL}" ++ elif ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}" ]; then + #if /boot is not a separate partition BOOT_IMAGE might start with /boot +- BOOT_IMAGE=${BOOT_IMAGE#"/boot"} +- [ -e "/boot/${BOOT_IMAGE}" ] || BOOT_IMAGE="vmlinuz-${KERNEL}" ++ BOOT_IMAGE_PATH=${BOOT_IMAGE_PATH#"/boot"} ++ #on some achitectures BOOT_IMAGE does not contain path to kernel ++ #so if we can't find anything, let's treat it in the same way as if it was empty ++ if ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then ++ BOOT_IMAGE_NAME="vmlinuz-${KERNEL}" ++ BOOT_IMAGE_PATH="" ++ fi + fi +- +- BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE%/*}/.${BOOT_IMAGE##*/}.hmac" + ++ BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE_PATH}.${BOOT_IMAGE_NAME}.hmac" + if ! [ -e "${BOOT_IMAGE_HMAC}" ]; then + warn "${BOOT_IMAGE_HMAC} does not exist" + return 1 + fi ++ + sha512hmac -c "${BOOT_IMAGE_HMAC}" || return 1 + fi + diff --git a/SOURCES/0527-dracut-Ajusting-variables-name-for-include.patch b/SOURCES/0527-dracut-Ajusting-variables-name-for-include.patch new file mode 100644 index 0000000..1db975d --- /dev/null +++ b/SOURCES/0527-dracut-Ajusting-variables-name-for-include.patch @@ -0,0 +1,90 @@ +From 7812b7a7b02cc5b4e66c6544f8f8c8748ada00bf Mon Sep 17 00:00:00 2001 +From: Erwan Velu +Date: Fri, 19 Dec 2014 14:49:00 +0100 +Subject: [PATCH] dracut: Ajusting variables name for --include + +When reading the --include part of the script, we had the following +issues to make the code easy to read: +- src & tgt were extract for the original options +- i variable was a file or a directory from src +- s variable was the directory name in case $i was a directory + +"s" sounds very close to "src" while "s" is on the "tgt" side. Very +confusing. + +"s" was defined before the "if it's a directory" statement while it's +only used inside the "if". + +"i" was commit from the "src" but wasn't really explicit. + +Having some lines mixing "i" and "s" takes a little time to get read +properly. + +This patch offer the following changes: +- "i" is renamed to "objectname" as we don't know if its a file or a + directory + +- "s" is renamed to "object_destdir" as the object name becomes a + directory on the destdir + +- "object_destdir" (former "s") is moved inside the "if" statement as it's + only used here + +- tgt is finally renamed to "target" to be more explicit. We are not all + native english ;o) + +My 2 (semantic) cents, + +Cherry-picked from: c9364f6ea296a03073bc4096756e3a61ca095c0e +Resolves: #1489882 +--- + dracut.sh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 3b91b5e8..873274c0 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1433,26 +1433,29 @@ if [[ $kernel_only != yes ]]; then + fi + fi + +-while pop include_src src && pop include_target tgt; do +- if [[ $src && $tgt ]]; then ++while pop include_src src && pop include_target target; do ++ if [[ $src && $target ]]; then + if [[ -f $src ]]; then +- inst $src $tgt ++ inst $src $target + else + ddebug "Including directory: $src" +- mkdir -p "${initdir}/${tgt}" ++ destdir="${initdir}/${target}" ++ mkdir -p "$destdir" + # check for preexisting symlinks, so we can cope with the + # symlinks to $prefix +- for i in "$src"/*; do +- [[ -e "$i" || -h "$i" ]] || continue +- s=${initdir}/${tgt}/${i#$src/} +- if [[ -d "$i" ]]; then +- if ! [[ -e "$s" ]]; then +- mkdir -m 0755 -p "$s" +- chmod --reference="$i" "$s" ++ # Objectname is a file or a directory ++ for objectname in "$src"/*; do ++ [[ -e "$objectname" || -h "$objectname" ]] || continue ++ if [[ -d "$objectname" ]]; then ++ # objectname is a directory, let's compute the final directory name ++ object_destdir=${destdir}/${objectname#$src/} ++ if ! [[ -e "$object_destdir" ]]; then ++ mkdir -m 0755 -p "$object_destdir" ++ chmod --reference="$objectname" "$object_destdir" + fi +- cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/* ++ cp --reflink=auto --sparse=auto -fa -t "$object_destdir" "$objectname"/* + else +- cp --reflink=auto --sparse=auto -fa -t "$s" "$i" ++ cp --reflink=auto --sparse=auto -fa -t "$destdir" "$objectname" + fi + done + fi diff --git a/SOURCES/0528-90dmsquash-live-we-don-t-have-find_binary-inside-ini.patch b/SOURCES/0528-90dmsquash-live-we-don-t-have-find_binary-inside-ini.patch new file mode 100644 index 0000000..e02045c --- /dev/null +++ b/SOURCES/0528-90dmsquash-live-we-don-t-have-find_binary-inside-ini.patch @@ -0,0 +1,24 @@ +From 5aadb107913d8c93c787b854fcf3e2b9cd37e0d7 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 11 Jan 2018 13:31:43 +0100 +Subject: [PATCH] 90dmsquash-live: we don't have find_binary inside initramdisk + +Cherry-picked from: c42c387cca3ecbb3ec7cef0ee1b8dd67b64782d1 +Resolves: #1449410 +--- + modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh +index 5fb798c7..6b3c2eb9 100755 +--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -85,7 +85,7 @@ else + # Symlinking /usr/bin/ntfs-3g as /sbin/mount.ntfs seems to boot + # at the first glance, but ends with lots and lots of squashfs + # errors, because systemd attempts to kill the ntfs-3g process?! +- if [ -x "$(find_binary "ntfs-3g")" ]; then ++ if [ -x "/usr/bin/ntfs-3g" ]; then + ( exec -a @ntfs-3g ntfs-3g -o ${liverw:-ro} $livedev /run/initramfs/live ) | vwarn + else + die "Failed to mount block device of live image: Missing NTFS support" diff --git a/SOURCES/0529-90dmsquash-live-ntfs-fix-depends.patch b/SOURCES/0529-90dmsquash-live-ntfs-fix-depends.patch new file mode 100644 index 0000000..6a34b29 --- /dev/null +++ b/SOURCES/0529-90dmsquash-live-ntfs-fix-depends.patch @@ -0,0 +1,26 @@ +From 19da2dda229257070aacb3a3658a84d9343a3433 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 11 Jan 2018 13:16:17 +0100 +Subject: [PATCH] 90dmsquash-live-ntfs: fix depends() + +Dependencies should not include module number. + +Cherry-picked from: f3e09bf1cb86248fb2fbc87d50f8d172898d3260 +Resolves: #1449410 +--- + modules.d/90dmsquash-live-ntfs/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90dmsquash-live-ntfs/module-setup.sh b/modules.d/90dmsquash-live-ntfs/module-setup.sh +index bc77376b..2354b840 100755 +--- a/modules.d/90dmsquash-live-ntfs/module-setup.sh ++++ b/modules.d/90dmsquash-live-ntfs/module-setup.sh +@@ -8,7 +8,7 @@ check() { + } + + depends() { +- echo 90dmsquash-live ++ echo dmsquash-live + return 0 + } + diff --git a/SOURCES/0530-dracut-lib.sh-dev_unit_name-use-systemd-escape-if-av.patch b/SOURCES/0530-dracut-lib.sh-dev_unit_name-use-systemd-escape-if-av.patch new file mode 100644 index 0000000..076b5c2 --- /dev/null +++ b/SOURCES/0530-dracut-lib.sh-dev_unit_name-use-systemd-escape-if-av.patch @@ -0,0 +1,28 @@ +From e8ffd4b3d4d50b65704f865829e76cac7ff060cc Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 21 Aug 2014 16:45:12 +0200 +Subject: [PATCH] dracut-lib.sh:dev_unit_name(): use systemd-escape, if + available + +Cherry-picked from: 85752f0f +Resolves: #1306640 +--- + modules.d/99base/dracut-lib.sh | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 78e01a78..e04a9b3d 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -870,6 +870,11 @@ wait_for_mount() + + dev_unit_name() + { ++ if command -v systemd-escape >/dev/null; then ++ systemd-escape -p "$1" ++ return ++ fi ++ + _name="${1%%/}" + _name="${_name##/}" + _name="$(str_replace "$_name" '-' '\x2d')" diff --git a/SOURCES/0531-Align-dev_unit_name-with-systemd-s-function.patch b/SOURCES/0531-Align-dev_unit_name-with-systemd-s-function.patch new file mode 100644 index 0000000..3ae6e58 --- /dev/null +++ b/SOURCES/0531-Align-dev_unit_name-with-systemd-s-function.patch @@ -0,0 +1,58 @@ +From 014a78261db67c287d25aafa33266593d816315a Mon Sep 17 00:00:00 2001 +From: Thorsten Behrens +Date: Thu, 11 Dec 2014 15:46:08 +0100 +Subject: [PATCH] Align dev_unit_name() with systemd's function. + +Add more corner cases from systemd's +unit_name_from_path_instance() C function. + +Signed-off-by: Thorsten Behrens +Signed-off-by: Thomas Renninger + +Cherry-picked from: e3eec4b8 +Resolves: #1306640 +--- + modules.d/99base/dracut-lib.sh | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index e04a9b3d..46cee5a9 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -868,18 +868,30 @@ wait_for_mount() + } >> "$hookdir/emergency/90-${_name}.sh" + } + ++# get a systemd-compatible unit name from a path ++# (mimicks unit_name_from_path_instance()) + dev_unit_name() + { ++ local dev="$1" ++ + if command -v systemd-escape >/dev/null; then +- systemd-escape -p "$1" ++ systemd-escape -p "$dev" + return + fi + +- _name="${1%%/}" +- _name="${_name##/}" +- _name="$(str_replace "$_name" '-' '\x2d')" +- _name="$(str_replace "$_name" '/' '-')" +- echo "$_name" ++ if [ "$dev" = "/" -o -z "$dev" ]; then ++ printf -- "-" ++ exit 0 ++ fi ++ ++ dev="${1%%/}" ++ dev="${dev##/}" ++ dev="$(str_replace "$dev" '\' '\x5c')" ++ dev="$(str_replace "$dev" '-' '\x2d')" ++ dev=${dev/#\./\\x2e} ++ dev="$(str_replace "$dev" '/' '-')" ++ ++ printf -- "%s" "$dev" + } + + # wait_for_dev diff --git a/SOURCES/0532-base-dracut-lib.sh-remove-bashism.patch b/SOURCES/0532-base-dracut-lib.sh-remove-bashism.patch new file mode 100644 index 0000000..cc0d187 --- /dev/null +++ b/SOURCES/0532-base-dracut-lib.sh-remove-bashism.patch @@ -0,0 +1,26 @@ +From 9dfcc5f0660b0d7cc7ca251dff940c4f2d0ddf95 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 24 Feb 2015 22:28:24 +0300 +Subject: [PATCH] base/dracut-lib.sh: remove bashism + +Cherry-picked from: 13efce5d +Resolves: #1306640 +--- + modules.d/99base/dracut-lib.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 46cee5a9..7502ab66 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -888,7 +888,9 @@ dev_unit_name() + dev="${dev##/}" + dev="$(str_replace "$dev" '\' '\x5c')" + dev="$(str_replace "$dev" '-' '\x2d')" +- dev=${dev/#\./\\x2e} ++ if [ "${dev##.}" != "$dev" ]; then ++ dev="\x2e${dev##.}" ++ fi + dev="$(str_replace "$dev" '/' '-')" + + printf -- "%s" "$dev" diff --git a/SOURCES/0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch b/SOURCES/0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch new file mode 100644 index 0000000..5b2936f --- /dev/null +++ b/SOURCES/0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch @@ -0,0 +1,32 @@ +From 58a5434f75567ecfe4a37252cedee25eb66da7d4 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 5 Jan 2016 22:11:57 +0300 +Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev + beginning with "-" + +crypt/parse-crypt.sh generate initqueue job which always call +dev_unit_name() with an argument beginning with "-". This results +in the following error: + +dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087 +dracut-initqueue[307]: systemd-escape: invalid option -- 'c' + +Cherry-picked from: c41df7e1 +Resolves: #1306640 +--- + modules.d/99base/dracut-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index 7502ab66..0a587ae6 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -875,7 +875,7 @@ dev_unit_name() + local dev="$1" + + if command -v systemd-escape >/dev/null; then +- systemd-escape -p "$dev" ++ systemd-escape -p -- "$dev" + return + fi + diff --git a/SOURCES/0534-90lvm-always-add-dm-snapshot.patch b/SOURCES/0534-90lvm-always-add-dm-snapshot.patch new file mode 100644 index 0000000..440aa93 --- /dev/null +++ b/SOURCES/0534-90lvm-always-add-dm-snapshot.patch @@ -0,0 +1,23 @@ +From de688a407c3dcc9f2a6ad6942e18d3d11f7862ca Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Tue, 26 Dec 2017 12:18:47 +0100 +Subject: [PATCH] 90lvm: always add dm-snapshot + +Resolves: #1546577 +--- + modules.d/90lvm/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh +index 23d63a04..b8f74546 100755 +--- a/modules.d/90lvm/module-setup.sh ++++ b/modules.d/90lvm/module-setup.sh +@@ -43,7 +43,7 @@ cmdline() { + } + + installkernel() { +- instmods dm-snapshot ++ hostonly='' instmods dm-snapshot + } + + # called by dracut diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index fb34544..3c0be0d 100644 --- a/SPECS/dracut.spec +++ b/SPECS/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 033 -Release: 502%{?dist}.1 +Release: 535%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -531,8 +531,38 @@ 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 -Patch503: 0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch -Patch504: 0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch +Patch503: 0503-fips-honor-BOOT_IMAGE-variable-for-HMAC-check-of-the.patch +Patch504: 0504-Try-BOOT_IMAGE-and-fallback-to-vmlinuz-KERNEL.patch +Patch505: 0505-dracut.cmdline-remove-extra-from-ip-doc.patch +Patch506: 0506-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch +Patch507: 0507-dracut.sh-introduce-no-hostonly-default-device-argum.patch +Patch508: 0508-rootfs-block-module-setup.sh-check-root_dev-in-cmdli.patch +Patch509: 0509-dracut.sh-gather-host_modalias-when-no-hostonly-defa.patch +Patch510: 0510-Add-NTFS-support-to-90dmsquash-live-module.patch +Patch511: 0511-add-90multipath-hostonly-module.patch +Patch512: 0512-spec-add-missing-modules.patch +Patch513: 0513-lvm_scan.sh-use-K-when-calling-lvchange.patch +Patch514: 0514-fcoe-Allow-more-time-for-the-bnx2x-link-negotiation-.patch +Patch515: 0515-add-mtu-parameter-for-bond-options.patch +Patch516: 0516-Fix-MTU-on-bond-interface.patch +Patch517: 0517-dracut.sh-source-dracut-version.sh-earlier-than-drac.patch +Patch518: 0518-network-Only-bring-up-wired-network-interfaces.patch +Patch519: 0519-network-ifup-don-t-arping-for-point-to-point-connect.patch +Patch520: 0520-guard-arrays-with.patch +Patch521: 0521-dracut.sh-for_each_host_xx-function-should-indicate-.patch +Patch522: 0522-dracut.sh-remove-quotes-from-install_items-and-insta.patch +Patch523: 0523-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch +Patch524: 0524-Simplify-microcode-lookup-for-for-AMD-CPUs.patch +Patch525: 0525-01fips-Fix-creating-path-to-.hmac-of-kernel-based-on.patch +Patch526: 0526-01fips-Properly-fix-creating-path-to-.hmac-of-kernel.patch +Patch527: 0527-dracut-Ajusting-variables-name-for-include.patch +Patch528: 0528-90dmsquash-live-we-don-t-have-find_binary-inside-ini.patch +Patch529: 0529-90dmsquash-live-ntfs-fix-depends.patch +Patch530: 0530-dracut-lib.sh-dev_unit_name-use-systemd-escape-if-av.patch +Patch531: 0531-Align-dev_unit_name-with-systemd-s-function.patch +Patch532: 0532-base-dracut-lib.sh-remove-bashism.patch +Patch533: 0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch +Patch534: 0534-90lvm-always-add-dm-snapshot.patch BuildRequires: bash git @@ -851,10 +881,12 @@ rm -rf -- $RPM_BUILD_ROOT %{dracutlibdir}/modules.d/90dm %{dracutlibdir}/modules.d/90dmraid %{dracutlibdir}/modules.d/90dmsquash-live +%{dracutlibdir}/modules.d/90dmsquash-live-ntfs %{dracutlibdir}/modules.d/90kernel-modules %{dracutlibdir}/modules.d/90lvm %{dracutlibdir}/modules.d/90mdraid %{dracutlibdir}/modules.d/90multipath +%{dracutlibdir}/modules.d/90multipath-hostonly %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop @@ -963,10 +995,74 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog -* Mon Dec 18 2017 Lukáš Nykrýn - 033-502.1 +* Mon Feb 19 2018 Lukas Nykryn - 033-535 +- 90lvm: always add dm-snapshot +Resolves: #1546577 + +* Thu Feb 01 2018 Lukas Nykryn - 033-534 +- base/dracut-lib.sh:dev_unit_name() guard against $dev beginning with "-" +- base/dracut-lib.sh: remove bashism +- Align dev_unit_name() with systemd's function. +- dracut-lib.sh:dev_unit_name(): use systemd-escape, if available +Resolves: #1306640 +- 90dmsquash-live-ntfs: fix depends() +- 90dmsquash-live: we don't have find_binary inside initramdisk +- dracut: Ajusting variables name for --include +Resolves: #1489882 + +* Wed Jan 03 2018 Lukas Nykryn - 033-527 +- 01fips: Properly fix creating path to .hmac of kernel based on BOOT_IMAGE +Resolves: #1415032 + +* Mon Dec 18 2017 Lukáš Nykrýn - 033-526 +- 01fips: Fix creating path to .hmac of kernel based on BOOT_IMAGE +Resolves: #1415032 + +* Mon Dec 18 2017 Lukáš Nykrýn - 033-525 - Support Microcode Updates for AMD CPU Family 0x17 Resolves: #1476039 +* Wed Dec 13 2017 Lukáš Nykrýn - 033-523 +- dracut.sh: remove quotes from install_items and install_optional_items +Related: #1520721 + +* Fri Dec 08 2017 Lukáš Nykrýn - 033-522 +- for_each_host_xx() function should indicate the empty case +Resolves: #1520721 + +* Fri Nov 03 2017 Lukáš Nykrýn - 033-520 +- network/ifup: don't arping for point-to-point connections +Resolves: #1477339 +- network: Only bring up wired network interfaces +Resolves: #1480246 +- dracut.sh: source dracut-version.sh earlier than dracut-functions.sh +Resolves: #1490777 +- Fix MTU on bond interface. +- add 'mtu' parameter for bond options +Resolves: #1494265 +- fcoe: Allow more time for the bnx2x link negotiation before brining up fcoe interfaces. +Resolves: #1378910 +- lvm_scan.sh: use -K when calling lvchange +Resolves: #1489841 + +* Thu Nov 02 2017 Lukáš Nykrýn - 033-513 +- spec: add missing modules +- add 90multipath-hostonly module +Resolves: #1457311 +- Add NTFS support to 90dmsquash-live module +Resolves: #1449410 +- dracut.sh: gather host_modalias when "--no-hostonly-default-device" is set +- rootfs-block/module-setup.sh: check root_dev in cmdline_rootfs() +- dracut.sh: introduce "--no-hostonly-default-device" argument +Resolves: #1483838 +- 10i18n/parse-i18n.sh: parse rd.vconsole and rd.locale +Resolves: #1479325 +- dracut.cmdline: remove extra ":" from ip= doc +Resolves: #1469997 +- Try BOOT_IMAGE and fallback to vmlinuz-${KERNEL} +- fips: honor $BOOT_IMAGE variable for HMAC check of the kernel +Resolves: #1415032 + * Wed Jun 28 2017 Lukáš Nykrýn - 033-502 - 01fips: add authenec module Resolves: #1465946