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

mount: try to mount even if module is not loaded

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
NewbieOrange 2025-08-26 21:32:31 +08:00 committed by Kent Overstreet
parent 90cbe3f3b4
commit 34f9eeba1d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/commands/mount.rs
View File

@ -218,23 +218,19 @@ pub struct Cli {
verbose: u8,
}
fn require_bcachefs_module() {
fn check_bcachefs_module() -> bool {
let path = Path::new("/sys/module/bcachefs");
if !path.exists() {
path.exists() || {
let _ = std::process::Command::new("modprobe")
.arg("bcachefs")
.status();
if !path.exists() {
error!("bcachefs module not loaded?");
std::process::exit(1);
}
path.exists()
}
}
pub fn mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> std::process::ExitCode {
require_bcachefs_module();
let module_loaded = check_bcachefs_module();
// If the bcachefs tool is being called as "bcachefs mount dev ..." (as opposed to via a
// symlink like "/usr/sbin/mount.bcachefs dev ...", then we need to pop the 0th argument
@ -252,6 +248,9 @@ pub fn mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> std::process::
Ok(_) => std::process::ExitCode::SUCCESS,
Err(e) => {
error!("Mount failed: {e}");
if !module_loaded {
error!("bcachefs module not loaded?");
}
std::process::ExitCode::FAILURE
}
}