Skip to content

fix(file): keep image holes and map ext4 journals in bmaps #158

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

Draft
JanZachmann wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

fix(file): keep image holes and map ext4 journals in bmaps #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
449c4d4
fix(file): keep the image layout when writing a partition back
JanZachmann Sep 28, 2026
5186d4b
chore: bump dependencies including major versions
JanZachmann Sep 28, 2026
2c7f060
style(device_update): drop redundant borrows in info! arguments
JanZachmann Sep 28, 2026
e9163a5
fix(file): keep holes when copying the image
JanZachmann Sep 28, 2026
e2443b2
fix(file): map the ext4 journals in a generated bmap
JanZachmann Sep 28, 2026
52fe21d
fix: copy image data segments larger than 2 GiB completely
JanZachmann Sep 28, 2026
19bcd30
fix(file): harden ext4 journal lookup for bmap generation
JanZachmann Sep 28, 2026
d7e7242
build(docker): install e2fsprogs in the builder
JanZachmann Sep 28, 2026
2912452
fix(file): keep zero blocks as holes when decompressing
JanZachmann Sep 28, 2026
84ba27e
refactor(file): move bmap generation into its own module
JanZachmann Sep 28, 2026
9842fef
test(file): cover ext4 journal edge cases and a flash onto old content
JanZachmann Sep 28, 2026
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,309 changes: 558 additions & 751 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ license = "MIT OR Apache-2.0"
name = "omnect-cli"
readme = "README.md"
repository = "https://github.com/omnect/omnect-cli"
version = "0.28.2"
version = "0.28.3"

[dependencies]
actix-web = "4.11"
actix-web = { version = "4.15", default-features = false, features = ["macros"] }
anyhow = "1"
base64 = { version = "0.22", default-features = false }
base64 = { version = "0.23", default-features = false }
bzip2 = { version = "0.6", default-features = true }
clap = { version = "4.5", default-features = false, features = [
clap = { version = "4.6", default-features = false, features = [
"derive",
"help",
"std",
Expand All @@ -25,21 +25,21 @@ env_logger = { version = "0.11", default-features = false }
filemagic = { version = "0.13", default-features = false, features = [
"pkg-config",
] }
flate2 = { version = "1.1", default-features = false }
flate2 = { version = "1.1", default-features = false, features = ["rust_backend"] }
gptman = { version = "3.1", default-features = false }
hmac = { version = "0.13", default-features = false }
mbrman = { version = "0.6", default-features = false }
omnect-crypto = { git = "https://github.com/omnect/omnect-crypto.git", tag = "0.4.0" }
omnect-crypto = { git = "https://github.com/omnect/omnect-crypto.git", tag = "0.5.0" }
keyring-core = { version = "1.0", default-features = false }
libfs = { version = "0.9", default-features = false }
libfs = { version = "0.9", default-features = false, features = ["use_linux"] }
log = { version = "0.4", default-features = false }
num_cpus = { version = "1.17", default-features = false }
oauth2 = { version = "5.0", default-features = false, features = [
"reqwest",
"native-tls",
] }
open = { version = "5.3", default-features = false }
regex = { version = "1.11", default-features = false }
open = { version = "5.4", default-features = false }
regex = { version = "1.13", default-features = false }
reqwest = { version = "0.13", default-features = false, features = [
"json",
"native-tls",
Expand All @@ -51,28 +51,28 @@ sha2 = { version = "0.11", default-features = false }
stdext = { version = "0.3", default-features = false }
strum = { version = "0.28", default-features = false }
strum_macros = { version = "0.28", default-features = false }
tempfile = { version = "3.20", default-features = false }
tempfile = { version = "3.27", default-features = false }
time = { version = "0.3", default-features = false }
tokio = { version = "1", default-features = false, features = [
"macros",
"fs",
"rt-multi-thread",
] }
toml = { version = "1.0", default-features = false, features = [
toml = { version = "1.1", default-features = false, features = [
"parse",
"serde",
] }
uuid = { version = "1.17", default-features = false, features = ["v4"] }
uuid = { version = "1.26", default-features = false, features = ["v4"] }
url = { version = "2.5", default-features = false }
validator = { version = "0.20", default-features = false, features = [
validator = { version = "0.21", default-features = false, features = [
"derive",
] }
xz2 = { version = "0.1", default-features = false }

[dev-dependencies]
assert_cmd = "2.0"
assert_cmd = "2.2"
assert-json-diff = "2.0"
data-encoding = "2.9"
data-encoding = "2.11"
file_diff = "1.0"
httpmock = "0.8"
predicates = "3.1"
Expand All @@ -81,5 +81,5 @@ tar = "0.4"

# metadata for building with cargo-deb (https://crates.io/crates/cargo-deb)
[package.metadata.deb]
depends = "bmap-tools, e2tools, keychain, libc6 (>= 2.34), libmagic1, libssl3 (>= 3.0.0), mtools"
depends = "bmap-tools, e2fsprogs, e2tools, keychain, libc6 (>= 2.34), libmagic1, libssl3 (>= 3.0.0), mtools"
revision = ""
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
bmap-tools \
ca-certificates \
e2fsprogs \
e2tools \
fdisk \
keychain \
Expand All @@ -37,7 +38,6 @@ RUN <<EOT
/usr/bin/dd \
/usr/bin/e2cp \
/usr/bin/e2mkdir \
/usr/bin/fallocate \
/usr/bin/mcopy \
/usr/bin/omnect-cli \
/usr/bin/ssh-keygen \
Expand Down
2 changes: 1 addition & 1 deletion project-context.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

## 4. Repository-Specific Constraints

- External tools `e2cp`, `e2mkdir`, `mcopy`, `mmd`, `dd`, `fallocate`, `ssh-keygen`, `fdisk` must be available at runtime (Dockerfile copies them explicitly).
- External tools `e2cp`, `e2mkdir`, `mcopy`, `mmd`, `dd`, `ssh-keygen`, `fdisk` must be available at runtime (Dockerfile copies them explicitly).
- Partition enum maps partition names to numbers differently for GPT vs MBR — see `file/functions.rs`.
- OAuth2 callback binds to `127.0.0.1:4000` and `[::1]:4000`; container mode overrides to `0.0.0.0`.
- `conf/` directory uses `.gitignore` to track only `*.template` files — actual configs are generated, never committed.
Expand Down
4 changes: 2 additions & 2 deletions src/device_update/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ pub async fn import_update(
debug!("import update: {import_update}");

let import_update_response = adu_client.import_update(instance_id, import_update).await?;
info!("Result of import update: {:?}", &import_update_response);
info!("Result of import update: {:?}", import_update_response);

Ok(())
}
Expand Down Expand Up @@ -321,7 +321,7 @@ pub async fn remove_update(
let remove_update_response = adu_client
.delete_update(instance_id, provider, name, version)
.await?;
info!("Result of remove update: {:?}", &remove_update_response);
info!("Result of remove update: {:?}", remove_update_response);

Ok(())
}
Expand Down
Loading
Loading