Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,210 changes: 691 additions & 519 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ debug = true

[profile.thin]
# drop bootc size when split debuginfo is not available and go a step
# further in size optimization (when tested from 140mb, to 12mb without
# further in size optimization (when tested from 140mb, to 12mb without
# symbols/debuginfo, to 5.8mb with extra optimizations)
# https://github.com/johnthagen/min-sized-rust
# cargo build --profile=thin
Expand Down Expand Up @@ -44,7 +44,7 @@ clap = "4.5.4"
clap_mangen = { version = "0.2.20" }
hex = "0.4.3"
indoc = "2.0.5"
indicatif = "0.17.0"
indicatif = "0.18.0"
fn-error-context = "0.2.1"
libc = "0.2.154"
openssl = "0.10.72"
Expand Down
4 changes: 2 additions & 2 deletions crates/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ linkme = "0.3"
openssl = { workspace = true }
regex = "1.10.4"
rustix = { workspace = true }
schemars = { version = "0.8.17", features = ["chrono"] }
schemars = { version = "1.0.4", features = ["chrono04"] }
serde = { workspace = true, features = ["derive"] }
serde_ignored = "0.1.10"
serde_json = { workspace = true }
Expand All @@ -52,7 +52,7 @@ tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"
tokio-util = { workspace = true }
tracing = { workspace = true }
tempfile = { workspace = true }
toml = "0.8.12"
toml = "0.9.5"
xshell = { version = "0.2.6", optional = true }
uuid = { version = "1.8.0", features = ["v4"] }
tini = "1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/lib/src/imgstorage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ fn bind_storage_roots(cmd: &mut Command, storage_root: &Dir, run_root: &Dir) ->
Mode::empty(),
)?;
rustix::process::fchdir(&storage_root)?;
rustix::thread::unshare(rustix::thread::UnshareFlags::NEWNS)?;
rustix::thread::unshare_unsafe(rustix::thread::UnshareFlags::NEWNS)?;
rustix::mount::mount_bind(".", STORAGE_ALIAS_DIR)?;
rustix::process::fchdir(&oldwd)?;
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion crates/lib/src/install/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ pub(crate) fn load_config() -> Result<Option<InstallConfiguration>> {
for (_name, path) in fragments {
let buf = std::fs::read_to_string(&path)?;
let mut unused = std::collections::HashSet::new();
let de = toml::Deserializer::new(&buf);
let de = toml::Deserializer::parse(&buf).with_context(|| format!("Parsing {path:?}"))?;
let mut c: InstallConfigurationToplevel = serde_ignored::deserialize(de, |path| {
unused.insert(path.to_string());
})
Expand Down
2 changes: 1 addition & 1 deletion crates/ostree-ext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn-error-context = { workspace = true }
futures-util = "0.3.13"
gvariant = "0.5.0"
hex = { workspace = true }
io-lifetimes = "2"
io-lifetimes = "3"
indicatif = { workspace = true }
libc = { workspace = true }
libsystemd = "0.7.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/ostree-ext/src/integrationtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ pub(crate) async fn create_fixture() -> Result<()> {
let fixture = crate::fixture::Fixture::new_v1()?;
let imgref = fixture.export_container().await?.0;
println!("Wrote: {:?}", imgref);
let path = fixture.into_tempdir().into_path();
let path = fixture.into_tempdir().keep();
println!("Wrote: {:?}", path);
Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion crates/system-reinstall-bootc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ serde_yaml = "0.9.22"
tempfile = { workspace = true }
tracing = { workspace = true }
uzers = "0.12.1"
which = "7.0.2"
which = "8.0.0"

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/tests-integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn-error-context = { workspace = true }
indoc = { workspace = true }
libtest-mimic = "0.8.0"
oci-spec = "0.8.0"
rexpect = "0.5"
rexpect = "0.6"
rustix = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ camino = { workspace = true }
chrono = { workspace = true, features = ["std"] }
fn-error-context = { workspace = true }
tar = "0.4"
toml = "0.8"
toml = "0.9"
tempfile = { workspace = true }
mandown = "0.1.3"
mandown = "1.1.0"
xshell = { version = "0.2.6" }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/xtask/src/xtask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ fn impl_srpm(sh: &Shell) -> Result<Utf8PathBuf> {
}
let pkg = impl_package(sh)?;
let td = tempfile::tempdir_in("target").context("Allocating tmpdir")?;
let td = td.into_path();
let td = td.keep();
let td: &Utf8Path = td.as_path().try_into().unwrap();
let srcpath = &pkg.srcpath;
cmd!(sh, "mv {srcpath} {td}").run()?;
Expand Down