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

refactor(mount): rename opt => cli

Browse Source 
The term option is already used for mount options and the `Option` type.
In other modules it's just called `cli`, so let's do that here as well.

Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-06-26 17:06:58 +02:00
parent cf180e8f34
commit a411e7237f
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/commands/mount.rs
View File

@ -305,29 +305,29 @@ fn devs_str_sbs_from_device(
} }
} }
fn cmd_mount_inner(opt: Cli) -> Result<()> { fn cmd_mount_inner(cli: Cli) -> Result<()> {
// Grab the udev information once // Grab the udev information once
let udev_info = udev_bcachefs_info()?; let udev_info = udev_bcachefs_info()?;
let (devices, sbs) = if let Some(uuid) = opt.dev.strip_prefix("UUID=") { let (devices, sbs) = if let Some(uuid) = cli.dev.strip_prefix("UUID=") {
devs_str_sbs_from_uuid(&udev_info, uuid)? devs_str_sbs_from_uuid(&udev_info, uuid)?
} else if let Some(uuid) = opt.dev.strip_prefix("OLD_BLKID_UUID=") { } else if let Some(uuid) = cli.dev.strip_prefix("OLD_BLKID_UUID=") {
devs_str_sbs_from_uuid(&udev_info, uuid)? devs_str_sbs_from_uuid(&udev_info, uuid)?
} else { } else {
// If the device string contains ":" we will assume the user knows the entire list. // If the device string contains ":" we will assume the user knows the entire list.
// If they supply a single device it could be either the FS only has 1 device or it's // If they supply a single device it could be either the FS only has 1 device or it's
// only 1 of a number of devices which are part of the FS. This appears to be the case // only 1 of a number of devices which are part of the FS. This appears to be the case
// when we get called during fstab mount processing and the fstab specifies a UUID. // when we get called during fstab mount processing and the fstab specifies a UUID.
if opt.dev.contains(':') { if cli.dev.contains(':') {
let sbs = opt let sbs = cli
.dev .dev
.split(':') .split(':')
.map(read_super_silent) .map(read_super_silent)
.collect::<Result<Vec<_>>>()?; .collect::<Result<Vec<_>>>()?;
(opt.dev, sbs) (cli.dev, sbs)
} else { } else {
devs_str_sbs_from_device(&udev_info, Path::new(&opt.dev))? devs_str_sbs_from_device(&udev_info, Path::new(&cli.dev))?
} }
}; };
@ -338,7 +338,7 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> {
if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } { if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } {
let _key_handle: KeyHandle = KeyHandle::new_from_search(&uuid).or_else(|_| { let _key_handle: KeyHandle = KeyHandle::new_from_search(&uuid).or_else(|_| {
opt.passphrase_file cli.passphrase_file
.and_then(|path| match Passphrase::new_from_file(path) { .and_then(|path| match Passphrase::new_from_file(path) {
Ok(p) => Some(KeyHandle::new(&first_sb, &p)), Ok(p) => Some(KeyHandle::new(&first_sb, &p)),
Err(e) => { Err(e) => {
@ -349,24 +349,24 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> {
None None
} }
}) })
.unwrap_or_else(|| opt.unlock_policy.apply(&first_sb)) .unwrap_or_else(|| cli.unlock_policy.apply(&first_sb))
})?; })?;
} }
if let Some(mountpoint) = opt.mountpoint { if let Some(mountpoint) = cli.mountpoint {
info!( info!(
"mounting with params: device: {}, target: {}, options: {}", "mounting with params: device: {}, target: {}, options: {}",
devices, devices,
mountpoint.to_string_lossy(), mountpoint.to_string_lossy(),
&opt.options &cli.options
); );
let (data, mountflags) = parse_mount_options(&opt.options); let (data, mountflags) = parse_mount_options(&cli.options);
mount_inner(devices, mountpoint, "bcachefs", mountflags, data) mount_inner(devices, mountpoint, "bcachefs", mountflags, data)
} else { } else {
info!( info!(
"would mount with params: device: {}, options: {}", "would mount with params: device: {}, options: {}",
devices, &opt.options devices, &cli.options
); );
Ok(()) Ok(())
@ -381,17 +381,17 @@ pub fn mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> i32 {
argv.remove(0); argv.remove(0);
} }
let opt = Cli::parse_from(argv); let cli = Cli::parse_from(argv);
// @TODO : more granular log levels via mount option // @TODO : more granular log levels via mount option
log::set_max_level(match opt.verbose { log::set_max_level(match cli.verbose {
0 => LevelFilter::Warn, 0 => LevelFilter::Warn,
1 => LevelFilter::Trace, 1 => LevelFilter::Trace,
2_u8..=u8::MAX => todo!(), 2_u8..=u8::MAX => todo!(),
}); });
colored::control::set_override(opt.colorize); colored::control::set_override(cli.colorize);
if let Err(e) = cmd_mount_inner(opt) { if let Err(e) = cmd_mount_inner(cli) {
error!("Fatal error: {}", e); error!("Fatal error: {}", e);
1 1
} else { } else {