|
|
@ -29,7 +29,7 @@ check() { |
|
|
|
pushd . > /dev/null |
|
|
|
pushd . > /dev/null |
|
|
|
for_each_host_dev_and_slaves is_nvmf |
|
|
|
for_each_host_dev_and_slaves is_nvmf |
|
|
|
local _is_nvmf=$? |
|
|
|
local _is_nvmf=$? |
|
|
|
popd > /dev/null |
|
|
|
popd > /dev/null || exit |
|
|
|
[[ $_is_nvmf == 0 ]] || return 255 |
|
|
|
[[ $_is_nvmf == 0 ]] || return 255 |
|
|
|
if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ]; then |
|
|
|
if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ]; then |
|
|
|
if [ ! -f /etc/nvme/discovery.conf ]; then |
|
|
|
if [ ! -f /etc/nvme/discovery.conf ]; then |
|
|
@ -76,7 +76,7 @@ cmdline() { |
|
|
|
done |
|
|
|
done |
|
|
|
|
|
|
|
|
|
|
|
[ -z "$trtype" ] && return 0 |
|
|
|
[ -z "$trtype" ] && return 0 |
|
|
|
nvme list-subsys ${PWD##*/} | while read x dev trtype traddr host_traddr state ana; do |
|
|
|
nvme list-subsys "${PWD##*/}" | while read -r _ _ trtype traddr host_traddr _; do |
|
|
|
[ "$trtype" != "${trtype#NQN}" ] && continue |
|
|
|
[ "$trtype" != "${trtype#NQN}" ] && continue |
|
|
|
echo -n " nvmf.discover=$trtype,${traddr#traddr=},${host_traddr#host_traddr=}" |
|
|
|
echo -n " nvmf.discover=$trtype,${traddr#traddr=},${host_traddr#host_traddr=}" |
|
|
|
done |
|
|
|
done |
|
|
@ -94,14 +94,15 @@ cmdline() { |
|
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && { |
|
|
|
[[ $hostonly ]] || [[ $mount_needs ]] && { |
|
|
|
pushd . > /dev/null |
|
|
|
pushd . > /dev/null |
|
|
|
for_each_host_dev_and_slaves gen_nvmf_cmdline |
|
|
|
for_each_host_dev_and_slaves gen_nvmf_cmdline |
|
|
|
popd > /dev/null |
|
|
|
popd > /dev/null || exit |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
# called by dracut |
|
|
|
# called by dracut |
|
|
|
install() { |
|
|
|
install() { |
|
|
|
if [[ $hostonly_cmdline == "yes" ]]; then |
|
|
|
if [[ $hostonly_cmdline == "yes" ]]; then |
|
|
|
local _nvmf_args=$(cmdline) |
|
|
|
local _nvmf_args |
|
|
|
|
|
|
|
_nvmf_args=$(cmdline) |
|
|
|
[[ "$_nvmf_args" ]] && printf "%s" "$_nvmf_args" >> "${initdir}/etc/cmdline.d/95nvmf-args.conf" |
|
|
|
[[ "$_nvmf_args" ]] && printf "%s" "$_nvmf_args" >> "${initdir}/etc/cmdline.d/95nvmf-args.conf" |
|
|
|
fi |
|
|
|
fi |
|
|
|
inst_simple "/etc/nvme/hostnqn" |
|
|
|
inst_simple "/etc/nvme/hostnqn" |
|
|
|