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

Update to rustix 1.0

Browse Source 
No major changes required; we get to drop one `unsafe` call
which is nice!

Looks like the ecosystem overall will need a fair bit of porting
before we can drop the 0.38 version though.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters
2025-03-30 16:42:12 +00:00
parent 61c7ee4c65
commit 8d97dddb14
5 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Cargo.lock generated
View File

@@ -224,7 +224,7 @@ dependencies = [
"openssl",
"ostree-ext",
"regex",
"rustix",
"rustix 1.0.3",
"schemars",
"serde",
"serde_ignored",
@@ -254,7 +254,7 @@ dependencies = [
"fn-error-context",
"hex",
"indoc",
"rustix",
"rustix 1.0.3",
"similar-asserts",
"tempfile",
"thiserror 2.0.12",
@@ -271,7 +271,7 @@ dependencies = [
"cap-std-ext",
"fn-error-context",
"indoc",
"rustix",
"rustix 1.0.3",
"similar-asserts",
"tempfile",
"thiserror 2.0.12",
@@ -283,7 +283,7 @@ name = "bootc-utils"
version = "0.0.0"
dependencies = [
"anyhow",
"rustix",
"rustix 1.0.3",
"serde",
"serde_json",
"shlex",
@@ -335,9 +335,9 @@ dependencies = [
[[package]]
name = "cap-primitives"
version = "3.4.1"
version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82fa6c3f9773feab88d844aa50035a33fb6e7e7426105d2f4bb7aadc42a5f89a"
checksum = "8fc15faeed2223d8b8e8cc1857f5861935a06d06713c4ac106b722ae9ce3c369"
dependencies = [
"ambient-authority",
"fs-set-times",
@@ -345,22 +345,22 @@ dependencies = [
"io-lifetimes",
"ipnet",
"maybe-owned",
"rustix",
"windows-sys 0.52.0",
"rustix 0.38.44",
"windows-sys 0.59.0",
"winx",
]
[[package]]
name = "cap-std"
version = "3.4.1"
version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f71b70818556b4fe2a10c7c30baac3f5f45e973f49fc2673d7c75c39d0baf5b"
checksum = "c3dbd3e8e8d093d6ccb4b512264869e1281cdb032f7940bd50b2894f96f25609"
dependencies = [
"camino",
"cap-primitives",
"io-extras",
"io-lifetimes",
"rustix",
"rustix 0.38.44",
]
[[package]]
@@ -372,7 +372,7 @@ dependencies = [
"cap-primitives",
"cap-tempfile",
"libc",
"rustix",
"rustix 0.38.44",
]
[[package]]
@@ -384,7 +384,7 @@ dependencies = [
"camino",
"cap-std",
"rand",
"rustix",
"rustix 0.38.44",
"uuid",
]
@@ -510,7 +510,7 @@ dependencies = [
"indicatif",
"oci-spec",
"regex-automata 0.4.9",
"rustix",
"rustix 0.38.44",
"sha2",
"tar",
"tempfile",
@@ -543,7 +543,7 @@ dependencies = [
"fn-error-context",
"futures-util",
"oci-spec",
"rustix",
"rustix 0.38.44",
"semver",
"serde",
"serde_json",
@@ -585,7 +585,7 @@ dependencies = [
"bitflags 2.6.0",
"crossterm_winapi",
"parking_lot",
"rustix",
"rustix 0.38.44",
"winapi",
]
@@ -828,7 +828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb"
dependencies = [
"io-lifetimes",
"rustix",
"rustix 0.38.44",
"windows-sys 0.52.0",
]
@@ -1298,6 +1298,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "linux-raw-sys"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -1602,7 +1608,7 @@ dependencies = [
"pin-project",
"quickcheck",
"regex",
"rustix",
"rustix 1.0.3",
"serde",
"serde_json",
"similar-asserts",
@@ -1915,11 +1921,24 @@ dependencies = [
"errno",
"itoa",
"libc",
"linux-raw-sys",
"linux-raw-sys 0.4.14",
"once_cell",
"windows-sys 0.59.0",
]
[[package]]
name = "rustix"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
dependencies = [
"bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys 0.9.3",
"windows-sys 0.59.0",
]
[[package]]
name = "rustversion"
version = "1.0.18"
@@ -2212,7 +2231,7 @@ dependencies = [
"indoc",
"log",
"openssh-keys",
"rustix",
"rustix 1.0.3",
"serde",
"serde_json",
"serde_yaml",
@@ -2248,7 +2267,7 @@ dependencies = [
"cfg-if",
"fastrand",
"once_cell",
"rustix",
"rustix 0.38.44",
"windows-sys 0.59.0",
]
@@ -2264,7 +2283,7 @@ dependencies = [
"indoc",
"libtest-mimic",
"oci-spec",
"rustix",
"rustix 1.0.3",
"serde",
"serde_json",
"tempfile",
@@ -2670,7 +2689,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283"
dependencies = [
"either",
"env_home",
"rustix",
"rustix 0.38.44",
"winsafe",
]
@@ -2825,8 +2844,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
"linux-raw-sys",
"rustix",
"linux-raw-sys 0.4.14",
"rustix 0.38.44",
]
[[package]]

2
Cargo.toml
View File

@@ -54,7 +54,7 @@ indicatif = "0.17.0"
fn-error-context = "0.2.1"
libc = "0.2.154"
openssl = "0.10.33"
rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
rustix = { "version" = "1", features = ["thread", "net", "fs", "system", "process", "mount"] }
serde = "1.0.199"
serde_json = "1.0.116"
similar-asserts = "1.5.0"

10
lib/src/mount.rs
View File

@@ -2,6 +2,7 @@
use std::{
fs,
mem::MaybeUninit,
os::fd::{AsFd, OwnedFd},
process::Command,
};
@@ -199,7 +200,7 @@ pub(crate) fn open_tree_from_pidns(
// And send that file descriptor via fd passing over the socketpair.
let fd = fd.as_fd();
let fds = [fd];
let mut buffer = [0u8; rustix::cmsg_space!(ScmRights(1))];
let mut buffer = [MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
let mut control = SendAncillaryBuffer::new(&mut buffer);
let pushed = control.push(SendAncillaryMessage::ScmRights(&fds));
assert!(pushed);
@@ -218,7 +219,7 @@ pub(crate) fn open_tree_from_pidns(
let pid = rustix::process::Pid::from_raw(n).unwrap();
drop(sock_child);
// Receive the mount file descriptor from the child
let mut cmsg_space = vec![0; rustix::cmsg_space!(ScmRights(1))];
let mut cmsg_space = vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
let mut cmsg_buffer = rustix::net::RecvAncillaryBuffer::new(&mut cmsg_space);
let mut buf = [0u8; DUMMY_DATA.len()];
let iov = std::io::IoSliceMut::new(buf.as_mut());
@@ -244,8 +245,9 @@ pub(crate) fn open_tree_from_pidns(
.next()
.ok_or_else(|| anyhow::anyhow!("Did not receive a file descriptor"))?;
// SAFETY: Since we're not setting WNOHANG, this will always return Some().
let st =
rustix::process::waitpid(Some(pid), WaitOptions::empty())?.expect("Wait status");
let st = rustix::process::waitpid(Some(pid), WaitOptions::empty())?
.expect("Wait status")
.1;
if let Some(0) = st.exit_status() {
Ok(r)
} else {

3
system-reinstall-bootc/src/users.rs
View File

@@ -155,8 +155,7 @@ fn get_keys_from_files(user: &uzers::User, keyfiles: &Vec<&str>) -> Result<Vec<P
}
// Safety: The UID should be valid because we got it from uzers
#[allow(unsafe_code)]
let user_uid = unsafe { Uid::from_raw(user.uid()) };
let user_uid = Uid::from_raw(user.uid());
// Change the effective uid for this scope, to avoid accidentally reading files we
// shouldn't through symlinks

2
utils/src/command.rs
View File

@@ -101,7 +101,7 @@ impl CommandRunExt for Command {
unsafe {
self.pre_exec(|| {
rustix::process::set_parent_process_death_signal(Some(
rustix::process::Signal::Term,
rustix::process::Signal::TERM,
))
.map_err(Into::into)
})