kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

95fcoe: don't install if there is no FCoE hostonly devices 

When in hostonly mode, 95fcoe module will still be installed even there
is no FCoE hostonly device. So use the new block_is_fcoe helper to check
for hostonly device in hostonly mode, avoid installing unneccessary module.

Signed-off-by: Kairui Song <kasong@redhat.com>
master
Kairui Song 2020-11-13 18:08:47 +08:00 committed by Daniel Molkentin
parent 4339d47cf8
commit 8c8af8a2cd
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules.d/95fcoe-uefi/module-setup.sh
View File

@ -2,22 +2,15 @@


# called by dracut # called by dracut
check() { check() {
local _fcoe_ctlr is_fcoe() {
[[ $hostonly ]] || [[ $mount_needs ]] && { block_is_fcoe $1 || return 1
for c in /sys/bus/fcoe/devices/ctlr_* ; do
[ -L $c ] || continue
_fcoe_ctlr=$c
done
[ -z "$_fcoe_ctlr" ] && return 255
} }

[[ $hostonly ]] || [[ $mount_needs ]] && { [[ $hostonly ]] || [[ $mount_needs ]] && {
for_each_host_dev_and_slaves is_fcoe || return 255
[ -d /sys/firmware/efi ] || 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 require_binaries dcbtool fipvlan lldpad ip readlink || return 1
return 0 return 0
} }

11
modules.d/95fcoe/module-setup.sh
View File

@ -2,13 +2,12 @@


# called by dracut # called by dracut
check() { check() {
local _fcoe_ctlr is_fcoe() {
block_is_fcoe $1 || return 1
}

[[ $hostonly ]] || [[ $mount_needs ]] && { [[ $hostonly ]] || [[ $mount_needs ]] && {
for c in /sys/bus/fcoe/devices/ctlr_* ; do for_each_host_dev_and_slaves is_fcoe || return 255
[ -L $c ] || continue
_fcoe_ctlr=$c
done
[ -z "$_fcoe_ctlr" ] && return 255
} }


require_binaries dcbtool fipvlan lldpad ip readlink fcoemon fcoeadm || return 1 require_binaries dcbtool fipvlan lldpad ip readlink fcoemon fcoeadm || return 1