Skip to content

lib: Bump to ostree-ext 0.12, rustix 0.38 #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2023
Merged

lib: Bump to ostree-ext 0.12, rustix 0.38 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ rust-version = "1.64.0"
[dependencies]
anyhow = "1.0"
camino = { version = "1.0.4", features = ["serde1"] }
ostree-ext = "0.11.5"
ostree-ext = "0.12"
clap = { version= "4.2", features = ["derive"] }
clap_mangen = { version = "0.2", optional = true }
cap-std-ext = "2"
cap-std-ext = "3"
hex = "^0.4"
fn-error-context = "0.2.0"
gvariant = "0.4.0"
Expand All @@ -27,7 +27,7 @@ once_cell = "1.9"
openssl = "^0.10"
nix = ">= 0.24, < 0.26"
regex = "1.7.1"
rustix = { "version" = "0.37", features = ["thread", "process"] }
rustix = { "version" = "0.38", features = ["thread", "fs", "system", "process"] }
schemars = "0.8.6"
serde = { features = ["derive"], version = "1.0.125" }
serde_json = "1.0.64"
Expand Down
18 changes: 8 additions & 10 deletions lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ mod baseline;

use std::io::BufWriter;
use std::io::Write;
use std::os::fd::AsFd;
use std::str::FromStr;
use std::sync::Arc;

Expand Down Expand Up @@ -311,7 +312,7 @@ impl SourceInfo {
.quiet()
.read()?;
let root = cap_std::fs::Dir::open_ambient_dir("/", cap_std::ambient_authority())?;
let repo = ostree::Repo::open_at_dir(&root, "ostree/repo")?;
let repo = ostree::Repo::open_at_dir(root.as_fd(), "ostree/repo")?;
let root = repo
.read_commit(commit.trim(), cancellable)
.context("Reading commit")?
Expand Down Expand Up @@ -492,13 +493,10 @@ async fn initialize_ostree_root_from_self(
.iter()
.map(|v| v.as_str())
.collect::<Vec<_>>();
#[allow(clippy::needless_update)]
let options = ostree_container::deploy::DeployOpts {
kargs: Some(kargs.as_slice()),
target_imgref: Some(&target_imgref),
proxy_cfg: Some(proxy_cfg),
..Default::default()
};
let mut options = ostree_container::deploy::DeployOpts::default();
options.kargs = Some(kargs.as_slice());
options.target_imgref = Some(&target_imgref);
options.proxy_cfg = Some(proxy_cfg);
println!("Creating initial deployment");
let state =
ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)).await?;
Expand Down Expand Up @@ -531,7 +529,7 @@ async fn initialize_ostree_root_from_self(
writeln!(f, "{}", root_setup.boot.to_fstab())?;
f.flush()?;

let uname = rustix::process::uname();
let uname = rustix::system::uname();

let aleph = InstallAleph {
image: src_imageref.imgref.name.clone(),
Expand Down Expand Up @@ -717,7 +715,7 @@ pub(crate) fn propagate_tmp_mounts_to_host() -> Result<()> {
if path.try_exists()? {
std::os::unix::fs::symlink(&target, &tmp)
.with_context(|| format!("Symlinking {target} to {tmp}"))?;
let cwd = rustix::fs::cwd();
let cwd = rustix::fs::CWD;
rustix::fs::renameat_with(
cwd,
path.as_os_str(),
Expand Down