alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: keep compat with MSRV

Browse Source 
Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-05-31 02:27:43 +02:00
parent d42a097280
commit 31066e17e8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/mount.rs
View File

@ -345,15 +345,15 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> {
if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } {
let _key_handle = KeyHandle::new_from_search(&uuid).or_else(|_| {
opt.passphrase_file
.map(|path| {
Passphrase::new_from_file(&first_sb, path)
.inspect_err(|e| {
error!(
"Failed to read passphrase from file, falling back to prompt: {}",
e
)
})
.and_then(|p| KeyHandle::new(&first_sb, &p))
.and_then(|path| match Passphrase::new_from_file(&first_sb, path) {
Ok(p) => Some(KeyHandle::new(&first_sb, &p)),
Err(e) => {
error!(
"Failed to read passphrase from file, falling back to prompt: {}",
e
);
None
}
})
.unwrap_or_else(|| opt.unlock_policy.apply(&first_sb))
});