|
 |
218d2d |
From 10b86edba3ffe0ce13c5f43ff0193cdf04661358 Mon Sep 17 00:00:00 2001
|
|
|
218d2d |
From: Tomas Bzatek <tbzatek@redhat.com>
|
|
|
218d2d |
Date: Thu, 21 Sep 2023 14:31:07 +0200
|
|
|
218d2d |
Subject: [PATCH 21/23] fix(nvmf): move /etc/nvme/host{nqn,id} requirement to
|
|
|
218d2d |
hostonly
|
|
|
218d2d |
|
|
|
218d2d |
When creating initramfs for universal boot image such as an installer,
|
|
|
218d2d |
we can't include any machine-specific IDs. Let's move the check
|
|
|
218d2d |
for /etc/nvme/hostnqn and /etc/nvme/hostid files presence to
|
|
|
218d2d |
the hostonly section to avoid unsatisfied requirements.
|
|
|
218d2d |
|
|
|
218d2d |
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
|
|
|
218d2d |
|
|
|
218d2d |
Resolves: #2266331
|
|
|
218d2d |
---
|
|
|
218d2d |
modules.d/95nvmf/module-setup.sh | 8 ++++----
|
|
|
218d2d |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
218d2d |
|
|
|
218d2d |
diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh
|
|
|
218d2d |
index a8f30341..6a1e3f5b 100755
|
|
|
218d2d |
--- a/modules.d/95nvmf/module-setup.sh
|
|
|
218d2d |
+++ b/modules.d/95nvmf/module-setup.sh
|
|
|
218d2d |
@@ -3,8 +3,6 @@
|
|
|
218d2d |
# called by dracut
|
|
|
218d2d |
check() {
|
|
|
218d2d |
require_binaries nvme jq || return 1
|
|
|
218d2d |
- [ -f /etc/nvme/hostnqn ] || return 255
|
|
|
218d2d |
- [ -f /etc/nvme/hostid ] || return 255
|
|
|
218d2d |
|
|
|
218d2d |
is_nvmf() {
|
|
|
218d2d |
local _dev=$1
|
|
|
218d2d |
@@ -36,6 +34,8 @@ check() {
|
|
|
218d2d |
}
|
|
|
218d2d |
|
|
|
218d2d |
[[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
|
218d2d |
+ [ -f /etc/nvme/hostnqn ] || return 255
|
|
|
218d2d |
+ [ -f /etc/nvme/hostid ] || return 255
|
|
|
218d2d |
pushd . > /dev/null
|
|
|
218d2d |
for_each_host_dev_and_slaves is_nvmf
|
|
|
218d2d |
local _is_nvmf=$?
|
|
|
218d2d |
@@ -130,8 +130,8 @@ install() {
|
|
|
218d2d |
_nvmf_args=$(cmdline)
|
|
|
218d2d |
[[ "$_nvmf_args" ]] && printf "%s" "$_nvmf_args" >> "${initdir}/etc/cmdline.d/95nvmf-args.conf"
|
|
|
218d2d |
fi
|
|
|
218d2d |
- inst_simple "/etc/nvme/hostnqn"
|
|
|
218d2d |
- inst_simple "/etc/nvme/hostid"
|
|
|
218d2d |
+ inst_simple -H "/etc/nvme/hostnqn"
|
|
|
218d2d |
+ inst_simple -H "/etc/nvme/hostid"
|
|
|
218d2d |
|
|
|
218d2d |
inst_multiple ip sed
|
|
|
218d2d |
|
|
|
218d2d |
--
|
|
|
218d2d |
2.42.0
|
|
|
218d2d |
|