tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use new run_command helper

This commit is contained in:
Dietmar Maurer 2020-06-16 07:53:23 +02:00
parent bb59df9134
commit 5509b199fb
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/disks/lvm.rs
View File

@ -25,11 +25,7 @@ pub fn get_lvm_devices(
let mut command = std::process::Command::new(PVS_BIN_PATH); let mut command = std::process::Command::new(PVS_BIN_PATH);
command.args(&["--reportformat", "json", "--noheadings", "--readonly", "-o", "pv_name"]); command.args(&["--reportformat", "json", "--noheadings", "--readonly", "-o", "pv_name"]);
let output = command.output() let output = crate::tools::run_command(command, None)?;
.map_err(|err| format_err!("failed to execute '{}' - {}", PVS_BIN_PATH, err))?;
let output = crate::tools::command_output(output, None)
.map_err(|err| format_err!("pvs command failed: {}", err))?;
let mut device_set: HashSet<u64> = HashSet::new(); let mut device_set: HashSet<u64> = HashSet::new();

6
src/tools/disks/smart.rs
View File

@ -88,11 +88,7 @@ pub fn get_smart_data(
}; };
command.arg(disk_path); command.arg(disk_path);
let output = command.output() let output = crate::tools::run_command(command, None)?;
.map_err(|err| format_err!("failed to execute '{}' - {}", SMARTCTL_BIN_PATH, err))?;
let output = crate::tools::command_output(output, None)
.map_err(|err| format_err!("smartctl command failed: {}", err))?;
let output: serde_json::Value = output.parse()?; let output: serde_json::Value = output.parse()?;

6
src/tools/disks/zfs.rs
View File

@ -185,11 +185,7 @@ pub fn zfs_devices(
if let Some(pool) = pool { command.arg(pool); } if let Some(pool) = pool { command.arg(pool); }
let output = command.output() let output = crate::tools::run_command(command, None)?;
.map_err(|err| format_err!("failed to execute '/sbin/zpool' - {}", err))?;
let output = crate::tools::command_output(output, None)
.map_err(|err| format_err!("zpool list command failed: {}", err))?;
let list = parse_zfs_list(&output)?; let list = parse_zfs_list(&output)?;