containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 06:45:13 +01:00
Code Issues Activity

crates/system-reinstall-bootc: Fix various clippy lints

Browse Source 
Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters
2025-08-26 08:21:08 -04:00
parent a3fe7b2abc
commit 56ed02d8ee
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/system-reinstall-bootc/src/podman.rs
View File

@@ -112,14 +112,14 @@ pub(crate) fn pull_if_not_present(image: &str) -> Result<()> {
let result = image_exists_command(image).status()?;
if result.success() {
println!("Image {} is already present locally, skipping pull.", image);
println!("Image {image} is already present locally, skipping pull.");
return Ok(());
} else {
println!("Image {} is not present locally, pulling it now.", image);
println!("Image {image} is not present locally, pulling it now.");
println!();
pull_image_command(image)
.run_inherited_with_cmd_context()
.context(format!("pulling image {}", image))?;
.context(format!("pulling image {image}"))?;
}
Ok(())

7
crates/system-reinstall-bootc/src/users.rs
View File

@@ -172,15 +172,14 @@ fn get_keys_from_files(user: &uzers::User, keyfiles: &Vec<&str>) -> Result<Vec<P
fn get_keys_from_command(command: &str, command_user: &str) -> Result<Vec<PublicKey>> {
let user_config = uzers::get_user_by_name(command_user).context(format!(
"authorized_keys_command_user {} not found",
command_user
"authorized_keys_command_user {command_user} not found"
))?;
let mut cmd = Command::new(command);
cmd.uid(user_config.uid());
let output = cmd
.run_get_output()
.context(format!("running authorized_keys_command {}", command))?;
.context(format!("running authorized_keys_command {command}"))?;
let keys = PublicKey::read_keys(output)?;
Ok(keys)
}
@@ -201,7 +200,7 @@ pub(crate) fn get_all_users_keys() -> Result<Vec<UserKeys>> {
for user_name in loginctl_user_names {
let user_info = uzers::get_user_by_name(user_name.as_str())
.context(format!("user {} not found", user_name))?;
.context(format!("user {user_name} not found"))?;
let mut user_authorized_keys: Vec<PublicKey> = Vec::new();
if !sshd_config.authorized_keys_files.is_empty() {