blockdev: preparatory patches for osmet #191
Merged
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
Instead of a `mount_boot` function, have a more generic `mount_partition_by_label` function which takes the label as a parameter. While we're here, make it even more generic by accepting mount flags so that if a caller just wants to mount read-only, they can.
The `ioctl!` macros always declare their functions as pub, so let's put it in a submodule to keep it contained. It also makes it really obvious in the rest of the code when we're calling an ioctl by having to prefix it with `ioctl::`. Another minor bonus is that we can slap on `allow(clippy::missing_safety_doc)` on the whole block instead of individually. (Maybe that lint might need tweaking to ignore unsafe functions derived from macros?).
bgilbert
approved these changes
Mar 20, 2020
| @@ -30,28 +30,36 @@ use tempfile; | |||
|
|
|||
| use crate::errors::*; | |||
|
|
|||
| pub fn mount_boot(device: &str) -> Result<Mount> { | |||
| pub fn mount_partition_by_label(device: &str, label: &str, flags: mount::MsFlags) -> Result<Mount> { | |||
There was a problem hiding this comment.
This requires the caller to know about nix::mount. That seems like a reasonable tradeoff, but worth noting.
lucab
approved these changes
Mar 20, 2020
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.
Split out of #187. See individual commit messages.