3 Commits

Author SHA1 Message Date
b5c79756e4 chore: Release init version 2.5.3 2026-02-10 17:38:19 +01:00
d72cc10234 bump deps 2026-02-10 17:34:19 +01:00
9115024d34 lvm: PV also match udev filter 2026-02-10 17:30:16 +01:00
4 changed files with 6 additions and 4 deletions

3
Cargo.lock generated
View File

@ -327,7 +327,7 @@ dependencies = [
[[package]] [[package]]
name = "dkl" name = "dkl"
version = "1.0.0" version = "1.0.0"
source = "git+https://novit.tech/direktil/dkl#d2293df0112cb98e7b5e93dcb05cf8dbf1b05b56" source = "git+https://novit.tech/direktil/dkl#723cecff1b146f4ef8a8e3040508c0fcf02dfe96"
dependencies = [ dependencies = [
"async-compression", "async-compression",
"base32", "base32",
@ -943,6 +943,7 @@ dependencies = [
name = "init" name = "init"
version = "2.5.3" version = "2.5.3"
dependencies = [ dependencies = [
"base64",
"dkl", "dkl",
"env_logger", "env_logger",
"eyre", "eyre",

View File

@ -25,6 +25,7 @@ shell-escape = "0.1.5"
tokio = { version = "1.38.0", features = ["rt", "net", "fs", "process", "io-std", "io-util", "sync", "macros", "signal"] } tokio = { version = "1.38.0", features = ["rt", "net", "fs", "process", "io-std", "io-util", "sync", "macros", "signal"] }
termios = "0.3.3" termios = "0.3.3"
unix_mode = "0.1.4" unix_mode = "0.1.4"
base64 = "0.22.1"
sys-info = "0.9.1" sys-info = "0.9.1"
dkl = { git = "https://novit.tech/direktil/dkl", version = "1.0.0" } dkl = { git = "https://novit.tech/direktil/dkl", version = "1.0.0" }
openssl = "0.10.73" openssl = "0.10.73"

View File

@ -8,7 +8,6 @@ use tokio::{
use dkl::{ use dkl::{
self, self,
apply::{self, chroot, set_perms}, apply::{self, chroot, set_perms},
base64_decode,
bootstrap::Config, bootstrap::Config,
}; };
@ -90,7 +89,8 @@ impl Verifier {
return Ok(Self { pubkey: None }); return Ok(Self { pubkey: None });
}; };
let pubkey = base64_decode(pubkey)?; use base64::{prelude::BASE64_STANDARD, Engine};
let pubkey = BASE64_STANDARD.decode(pubkey)?;
let pubkey = Some(pubkey); let pubkey = Some(pubkey);
return Ok(Self { pubkey }); return Ok(Self { pubkey });

View File

@ -208,7 +208,7 @@ async fn find_devs(pvs: &LvmPV) -> Result<Vec<String>> {
let filter: udev::Filter = filter.clone().into(); let filter: udev::Filter = filter.clone().into();
(udev::all().await?.iter()) (udev::all().await?.iter())
.filter(|dev| dev.subsystem() == Some("block") && filter.matches(dev)) .filter(|dev| dev.subsystem() == Some("block") && filter.matches(dev))
.filter_map(|dev| dev.property("DEVNAME").map(|s| s.to_string())) .filter_map(|dev| dev.path().map(|s| s.to_string()))
.collect() .collect()
} else if !pvs.regexps.is_empty() { } else if !pvs.regexps.is_empty() {
let regexps: Vec<regex::Regex> = (pvs.regexps.iter()) let regexps: Vec<regex::Regex> = (pvs.regexps.iter())