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

Update mount.rs

Browse Source 
Fix incorrect args
This commit is contained in:
donmor 2024-05-27 13:54:05 +08:00 committed by GitHub
parent a910812905
commit d3e26ce0e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/mount.rs
View File

@ -371,11 +371,11 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
&& !key::check_for_key(&key_name)? && !key::check_for_key(&key_name)?
{ {
// First by password_file, if available // First by password_file, if available
let fallback_to_unlock_policy = if let Some(passphrase_file) = &opt.passphrase_file { let fallback_to_unlock_policy = if let Some(passphrase_file) = opt.passphrase_file {
// Unlock by passphrase_file specified by cli // Unlock by passphrase_file specified by cli
debug!("Attempting to unlock the master key with the passphrase file specified by cli"); debug!("Attempting to unlock the master key with the passphrase file specified by cli");
attempt_unlock_master_key_with_passphrase_file(&block_devices_to_mount[0], passphrase_file) attempt_unlock_master_key_with_passphrase_file(&block_devices_to_mount[0], passphrase_file)
} else if let Some(passphrase_file) = &parse_passphrase_file_from_mount_options(&opt.options) { } else if let Some(passphrase_file) = parse_passphrase_file_from_mount_options(&opt.options) {
// Unlock by passphrase_file specified by mount options // Unlock by passphrase_file specified by mount options
debug!("Attempting to unlock the master key with the passphrase_file specified in the mount options"); debug!("Attempting to unlock the master key with the passphrase_file specified in the mount options");
attempt_unlock_master_key_with_passphrase_file(&block_devices_to_mount[0], passphrase_file) attempt_unlock_master_key_with_passphrase_file(&block_devices_to_mount[0], passphrase_file)
@ -409,7 +409,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
Ok(()) Ok(())
} }
fn attempt_unlock_master_key_with_passphrase_file(block_device: bch_sb_handle, passphrase_file: PathBuf) -> bool { fn attempt_unlock_master_key_with_passphrase_file(block_device: &bch_sb_handle, passphrase_file: PathBuf) -> bool {
match key::read_from_passphrase_file(block_device, passphrase_file.as_path()) { match key::read_from_passphrase_file(block_device, passphrase_file.as_path()) {
Ok(()) => { Ok(()) => {
// Decryption succeeded // Decryption succeeded