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

Merge pull request #284 from tmuehlbacher/fix-result-eval

Browse Source 
fix: evaluate KeyHandle Result
This commit is contained in:
koverstreet 2024-05-31 11:34:36 -04:00 committed by GitHub
commit e739da5da8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/mount.rs
View File

@ -337,7 +337,7 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> {
let uuid = first_sb.sb().uuid(); let uuid = first_sb.sb().uuid();
if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } { if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } {
let _key_handle = KeyHandle::new_from_search(&uuid).or_else(|_| { let _key_handle: KeyHandle = KeyHandle::new_from_search(&uuid).or_else(|_| {
opt.passphrase_file opt.passphrase_file
.and_then(|path| match Passphrase::new_from_file(&first_sb, path) { .and_then(|path| match Passphrase::new_from_file(&first_sb, path) {
Ok(p) => Some(KeyHandle::new(&first_sb, &p)), Ok(p) => Some(KeyHandle::new(&first_sb, &p)),
@ -350,7 +350,7 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> {
} }
}) })
.unwrap_or_else(|| opt.unlock_policy.apply(&first_sb)) .unwrap_or_else(|| opt.unlock_policy.apply(&first_sb))
}); })?;
} }
if let Some(mountpoint) = opt.mountpoint { if let Some(mountpoint) = opt.mountpoint {