Drop import_args variable and let import_pool build its own arguments #75
Conversation
This file contains hidden or 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
Rather than define `import_args` in zfsbootmenu-parse-commandline.sh
based on the value of `force_import` and `read_write` on the ZBM kernel
command line, the parser just defines `force_import` and `read_write`
variables based on these arguments. The `import_pool` function uses
these variables directly to determine the right command-line arguments
to pass to `zpool import`.
This is a bit cleaner and allows for a construct like
read_write=yes import_pool zpool
to force rw imports rathern than rewriting `import_args`. Note that
passing `read_write=yes` in that call does not override the value in the
environment, so other calls to `import_pool` will fall back to expected
behavior.
zdykstra
approved these changes
Aug 23, 2020
Member
zdykstra
left a comment
zdykstra
left a comment
There was a problem hiding this comment.
This is a cleaner solution than randomly replacing variable values in a shared string, full merge ahead!
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.
Rather than define
import_argsinzfsbootmenu-parse-commandline.shbased on the value of
force_importandread_writeon the ZBM kernelcommand line, the parser just defines
force_importandread_writevariables based on these arguments. The
import_poolfunction usesthese variables directly to determine the right command-line arguments
to pass to
zpool import.This is a bit cleaner and allows for a construct like
to force rw imports rathern than rewriting
import_args. Note thatpassing
read_write=yesin that call does not override the value in theenvironment, so other calls to
import_poolwill fall back to expectedbehavior.