Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nvmf): require NVMeoF modules (bsc#1230468) (SL-Micro-6.0:Update) #376

Merged
merged 3 commits into from
Sep 13, 2024
Merged

fix(nvmf): require NVMeoF modules (bsc#1230468) (SL-Micro-6.0:Update) #376

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c695e
fix(nvmf): move /etc/nvme/host{nqn,id} requirement to hostonly
tbzatek Sep 21, 2023
927efd2
fix(nvmf): require NVMeoF modules
mwilck Sep 6, 2024
6222654
fix(nvmf): install (only) required nvmf modules
mwilck Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions modules.d/95nvmf/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

# called by dracut
check() {
local -A nvmf_trtypes

require_binaries nvme jq || return 1
[ -f /etc/nvme/hostnqn ] || return 255
[ -f /etc/nvme/hostid ] || return 255
require_kernel_modules nvme_fabrics || return 1

is_nvmf() {
local _dev=$1
Expand All @@ -22,7 +23,12 @@ check() {
break
fi
done
[[ $trtype == "fc" ]] || [[ $trtype == "tcp" ]] || [[ $trtype == "rdma" ]]
if [[ $trtype == "fc" ]] || [[ $trtype == "tcp" ]] || [[ $trtype == "rdma" ]]; then
nvmf_trtypes["nvme_${trtype}"]=1
return 0
else
return 1
fi
}

has_nbft() {
Expand All @@ -36,11 +42,14 @@ check() {
}

[[ $hostonly ]] || [[ $mount_needs ]] && {
[ -f /etc/nvme/hostnqn ] || return 255
[ -f /etc/nvme/hostid ] || return 255
pushd . > /dev/null
for_each_host_dev_and_slaves is_nvmf
local _is_nvmf=$?
popd > /dev/null || exit
[[ $_is_nvmf == 0 ]] || return 255
require_kernel_modules "${!nvmf_trtypes[@]}" || return 1
if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ] \
&& [ ! -f /etc/nvme/discovery.conf ] \
&& [ ! -f /etc/nvme/config.json ] && ! has_nbft; then
Expand All @@ -59,8 +68,9 @@ depends() {

# called by dracut
installkernel() {
instmods nvme_fc lpfc qla2xxx
hostonly="" instmods nvme_tcp nvme_fabrics 8021q
instmods nvme_fc nvme_tcp nvme_rdma lpfc qla2xxx
# 802.1q VLAN may be set up in Firmware later. Include the module always.
hostonly="" instmods 8021q
}

# called by dracut
Expand Down Expand Up @@ -130,8 +140,8 @@ install() {
_nvmf_args=$(cmdline)
[[ "$_nvmf_args" ]] && printf "%s" "$_nvmf_args" >> "${initdir}/etc/cmdline.d/95nvmf-args.conf"
fi
inst_simple "/etc/nvme/hostnqn"
inst_simple "/etc/nvme/hostid"
inst_simple -H "/etc/nvme/hostnqn"
inst_simple -H "/etc/nvme/hostid"

inst_multiple ip sed

Expand Down
Loading