diff --git a/8c8af8a2cd728e917be8465c79b12149e6877aef.patch b/8c8af8a2cd728e917be8465c79b12149e6877aef.patch new file mode 100644 index 0000000000000000000000000000000000000000..8575961140dd9929be992de706d8a23e5787bedd --- /dev/null +++ b/8c8af8a2cd728e917be8465c79b12149e6877aef.patch @@ -0,0 +1,55 @@ +diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh +index a464df5a0..9e5719dfb 100755 +--- a/modules.d/95fcoe-uefi/module-setup.sh ++++ b/modules.d/95fcoe-uefi/module-setup.sh +@@ -2,22 +2,15 @@ + + # called by dracut + check() { +- local _fcoe_ctlr +- [[ $hostonly ]] || [[ $mount_needs ]] && { +- for c in /sys/bus/fcoe/devices/ctlr_* ; do +- [ -L $c ] || continue +- _fcoe_ctlr=$c +- done +- [ -z "$_fcoe_ctlr" ] && return 255 ++ is_fcoe() { ++ block_is_fcoe $1 || return 1 + } ++ + [[ $hostonly ]] || [[ $mount_needs ]] && { ++ for_each_host_dev_and_slaves is_fcoe || return 255 + [ -d /sys/firmware/efi ] || return 255 +- for c in /sys/bus/fcoe/devices/ctlr_* ; do +- [ -L $c ] || continue +- fcoe_ctlr=$c +- done +- [ -z "$fcoe_ctlr" ] && return 255 + } ++ + require_binaries dcbtool fipvlan lldpad ip readlink || return 1 + return 0 + } +diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh +index 9b9e6c5c1..d98d5c0ae 100755 +--- a/modules.d/95fcoe/module-setup.sh ++++ b/modules.d/95fcoe/module-setup.sh +@@ -2,13 +2,12 @@ + + # called by dracut + check() { +- local _fcoe_ctlr ++ is_fcoe() { ++ block_is_fcoe $1 || return 1 ++ } ++ + [[ $hostonly ]] || [[ $mount_needs ]] && { +- for c in /sys/bus/fcoe/devices/ctlr_* ; do +- [ -L $c ] || continue +- _fcoe_ctlr=$c +- done +- [ -z "$_fcoe_ctlr" ] && return 255 ++ for_each_host_dev_and_slaves is_fcoe || return 255 + } + + require_binaries dcbtool fipvlan lldpad ip readlink fcoemon fcoeadm || return 1 diff --git a/dracut.spec b/dracut.spec index a85222233131910388f3d23c3e58b39f36bc6365..22bbf4a746aef6a6fdca606da29f247fefcb569f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 050 -Release: 3 +Release: 4 Summary: Initramfs generator using udev @@ -38,6 +38,7 @@ Patch10: dracut-lib.sh-quote-variables-in-parameter-expansion.patch Patch11: dracut-90crypt-module-setup.sh-fix-force-on-multiple-lines.patch Patch12: Fix-test-in-lsinitrd.patch Patch13: add-option-to-include-file-metadata-in-initramfs.patch +Patch6000: 8c8af8a2cd728e917be8465c79b12149e6877aef.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -488,6 +489,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* 20201124003007664888 patch-tracking 050-4 +- append patch file of upstream repository from <8c8af8a2cd728e917be8465c79b12149e6877aef> to <8c8af8a2cd728e917be8465c79b12149e6877aef> + * Thu Jul 23 2020 Liquor - 050-1 - Update to 050 @@ -516,4 +520,4 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne - Delete redundant information * Thu Aug 29 2019 openEuler Buildteam - 049-1 -- Package init +- Package init \ No newline at end of file