diff options
Diffstat (limited to 'modules.d/95nvmf')
| -rwxr-xr-x | modules.d/95nvmf/module-setup.sh | 8 | ||||
| -rwxr-xr-x | modules.d/95nvmf/parse-nvmf-boot-connections.sh | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh index a8f3034..6a1e3f5 100755 --- a/modules.d/95nvmf/module-setup.sh +++ b/modules.d/95nvmf/module-setup.sh @@ -3,8 +3,6 @@ # called by dracut check() { require_binaries nvme jq || return 1 - [ -f /etc/nvme/hostnqn ] || return 255 - [ -f /etc/nvme/hostid ] || return 255 is_nvmf() { local _dev=$1 @@ -36,6 +34,8 @@ 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=$? @@ -130,8 +130,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 diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh index 6601837..b2a5ae0 100755 --- a/modules.d/95nvmf/parse-nvmf-boot-connections.sh +++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh @@ -236,7 +236,9 @@ if ! getargbool 0 rd.nvmf.nonbft; then done fi -initqueue --onetime modprobe --all -b -q nvme_tcp nvme_core nvme_fabrics +initqueue --onetime modprobe -b -q nvme_tcp +initqueue --onetime modprobe -b -q nvme_core +initqueue --onetime modprobe -b -q nvme_fabrics parse_nvmf_discover() { traddr="none" |