Skip to content
Closed
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
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ platforms = ["*-unknown-linux-gnu"]

[dependencies]
# Internal crates
bootc-lib = { version = "1.13", path = "../lib" }
bootc-lib = { version = "1.14", path = "../lib" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.1.0" }

# Workspace dependencies
Expand Down
2 changes: 1 addition & 1 deletion crates/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "bootc-lib"
repository = "https://github.com/bootc-dev/bootc"
# The intention is we'll follow semver here, even though this
# project isn't actually published as a crate.
version = "1.13.0"
version = "1.14.0"
# In general we try to keep this pinned to what's in the latest RHEL9.
rust-version = "1.85.0"

Expand Down
62 changes: 61 additions & 1 deletion docs/src/host-v1.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"rollback": null,
"rollbackQueued": false,
"staged": null,
"type": null
"type": null,
"usrOverlay": null
}
}
},
Expand Down Expand Up @@ -220,6 +221,54 @@
}
]
},
"FilesystemOverlay": {
"description": "Details of an overlay filesystem: read-only or read/write, persistent or transient.",
"type": "object",
"properties": {
"accessMode": {
"description": "Whether the overlay is read-only or read/write",
"$ref": "#/$defs/FilesystemOverlayAccessMode"
},
"persistence": {
"description": "Whether the overlay will persist across reboots",
"$ref": "#/$defs/FilesystemOverlayPersistence"
}
},
"required": [
"accessMode",
"persistence"
]
},
"FilesystemOverlayAccessMode": {
"description": "The permissions mode of a /usr overlay",
"oneOf": [
{
"description": "The overlay is mounted read-only",
"type": "string",
"const": "readOnly"
},
{
"description": "The overlay is mounted read/write",
"type": "string",
"const": "readWrite"
}
]
},
"FilesystemOverlayPersistence": {
"description": "The persistence mode of a /usr overlay",
"oneOf": [
{
"description": "Changes are temporary and will be lost on reboot",
"type": "string",
"const": "transient"
},
{
"description": "Changes persist across reboots",
"type": "string",
"const": "persistent"
}
]
},
"HostSpec": {
"description": "The host specification",
"type": "object",
Expand Down Expand Up @@ -301,6 +350,17 @@
"type": "null"
}
]
},
"usrOverlay": {
"description": "The state of the overlay mounted on /usr",
"anyOf": [
{
"$ref": "#/$defs/FilesystemOverlay"
},
{
"type": "null"
}
]
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions docs/src/man/bootc-container-ukify.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Any additional arguments after `--` are passed through to ukify unchanged.

Default: /

**--allow-missing-verity**

Make fs-verity validation optional in case the filesystem doesn't support it

<!-- END GENERATED OPTIONS -->

# EXAMPLES
Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bootc-install-to-disk.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ its DPS type GUID, without requiring an explicit `root=` kernel argument.

Default: false

**--insecure**
**--allow-missing-verity**

Make fs-verity validation optional in case the filesystem doesn't support it

Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bootc-install-to-existing-root.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ of migrating the fstab entries. See the "Injecting kernel arguments" section abo

Default: false

**--insecure**
**--allow-missing-verity**

Make fs-verity validation optional in case the filesystem doesn't support it

Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bootc-install-to-filesystem.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ is currently expected to be empty by default.

Default: false

**--insecure**
**--allow-missing-verity**

Make fs-verity validation optional in case the filesystem doesn't support it

Expand Down
9 changes: 8 additions & 1 deletion tmt/plans/integration.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,15 @@ execute:
test:
- /tmt/tests/tests/test-34-user-agent

/plan-35-upgrade-preflight-disk-check:
summary: Verify pre-flight disk space check rejects images with inflated layer sizes
discover:
how: fmf
test:
- /tmt/tests/tests/test-35-upgrade-preflight-disk-check

/plan-36-rollback:
summary: Test bootc rollback functionality through image switch and rollback cycle
summary: Test bootc rollback functionality
discover:
how: fmf
test:
Expand Down
4 changes: 2 additions & 2 deletions tmt/tests/tests.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@

/test-35-upgrade-preflight-disk-check:
summary: Verify pre-flight disk space check rejects images with inflated layer sizes
duration: 20m
duration: 10m
test: nu booted/test-upgrade-preflight-disk-check.nu

/test-36-rollback:
summary: Test bootc rollback functionality through image switch and rollback cycle
summary: Test bootc rollback functionality
duration: 30m
test: nu booted/test-rollback.nu

Expand Down
Loading