Timberland final v3 with preserved autoconnect logic #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mwilck
force-pushed
the
timberland_final_v3-mwilck
branch
from
da7b094 to
7a62d85
Compare
mwilck
force-pushed
the
timberland_final_v3-mwilck
branch
from
7a62d85 to
83a5260
Compare
modules.d/95nvmf/nvmf-autoconnect.sh
Outdated
| # Make sure we don't use unsupported options with earlier versions. | ||
| NBFT_SUPPORTED= | ||
| # shellcheck disable=SC2016 | ||
| /usr/sbin/nvme connect-all --help 2>&1 | sed -n '/[[:space:]]--nbft[[:space:]]/q1;$q0' \ |
There was a problem hiding this comment.
Looks good to me. Let's push this upstream.
|
@johnmeneghini, if you approve, please merge this into your branch. It would feel odd if I did it. |
The hostname field in the NBFT is optional. Don't print a confusing error message 'NBFT: jq error while processing ".host_name"' if it is missing.
Since nvme-cli 2.0, configuration of subsystems to connect to is stored under `/etc/nvme` in either `discovery.conf` or `config.json`. Attempt discovery also if the latter exists, but not the former. Also, install "config.json" if it's present on the root FS. As before, "rd.nvmf.discover=fc,auto" will force either file to be ignored, and NBFT-defined targets take precedence if found.
This parameter causes any NVMe-oF targets specified during initramfs build to be ignored. This includes discovery.conf and config.json, as well as hostonly parameters determined at initramfs build time. The rationale is that network topology and available connections may have changed since the initramfs was built. Statically configured connections may fail or time out, causing potential boot failure. This parameter allows skipping such broken connections, and relying on dynamic configuration (NBFT or FC-autoconnect) exclusively.
johnmeneghini
force-pushed
the
timberland_final_v3
branch
from
3869355 to
64d30f4
Compare
johnmeneghini
force-pushed
the
timberland_final_v3-mwilck
branch
from
83a5260 to
9865102
Compare
|
I have rebased this branch onto the new |
|
Thanks John! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes