Skip to content

Commit 47cdef0

Browse files
committed
do-not-merge: checks should fail as musl should break
Signed-off-by: Fabiano Fidêncio <[email protected]>
1 parent c10b5c3 commit 47cdef0

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

crates/runc-shim/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ path = "src/main.rs"
2525
doc = false
2626

2727
[dependencies]
28-
containerd-shim = { path = "../shim", version = "0.10.0", features = ["async"] }
28+
containerd-shim = { path = "../shim", version = "0.9.0", features = ["async"] }
2929
libc.workspace = true
3030
log.workspace = true
3131
nix = { workspace = true, features = ["socket", "uio", "term"] }

crates/shim-protos/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "containerd-shim-protos"
3-
version = "0.10.0"
3+
version = "0.9.0"
44
authors = [
55
"Maksym Pavlenko <[email protected]>",
66
"The containerd Authors",

crates/shim/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "containerd-shim"
3-
version = "0.10.0"
3+
version = "0.9.0"
44
authors = [
55
"Maksym Pavlenko <[email protected]>",
66
"The containerd Authors",
@@ -29,7 +29,7 @@ path = "examples/windows_log_reader.rs"
2929

3030
[dependencies]
3131
which = "7.0.1"
32-
containerd-shim-protos = { path = "../shim-protos", version = "0.10.0" }
32+
containerd-shim-protos = { path = "../shim-protos", version = "0.9.0" }
3333
go-flag = "0.1.0"
3434
lazy_static = "1.4.0"
3535
sha2 = "0.10.2"

crates/shim/src/mount_linux.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -813,21 +813,6 @@ pub fn setup_loop_dev(backing_file: &str, loop_dev: &str, params: &LoopParams) -
813813
info,
814814
);
815815
#[cfg(target_env = "musl")]
816-
let ret = libc::ioctl(
817-
loop_dev.as_raw_fd() as libc::c_int,
818-
LOOP_SET_STATUS64 as libc::c_int,
819-
info,
820-
);
821-
#[cfg(target_env = "gnu")]
822-
if let Err(e) = nix::errno::Errno::result(ret) {
823-
libc::ioctl(
824-
loop_dev.as_raw_fd() as libc::c_int,
825-
LOOP_CLR_FD as libc::c_ulong,
826-
0,
827-
);
828-
return Err(Error::Nix(e));
829-
}
830-
#[cfg(target_env = "musl")]
831816
if let Err(e) = nix::errno::Errno::result(ret) {
832817
libc::ioctl(
833818
loop_dev.as_raw_fd() as libc::c_int,

0 commit comments

Comments
 (0)