Skip to content
Merged
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.9", path = "../lib" }
bootc-lib = { version = "1.10", path = "../lib" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.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.9.0"
version = "1.10.0"
# In general we try to keep this pinned to what's in the latest RHEL9.
rust-version = "1.84.0"

Expand Down
56 changes: 56 additions & 0 deletions docs/src/host-v1.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@
}
]
},
"composefs": {
"description": "If this boot entry is composefs based, the corresponding state",
"anyOf": [
{
"$ref": "#/$defs/BootEntryComposefs"
},
{
"type": "null"
}
]
},
"image": {
"description": "The image reference",
"anyOf": [
Expand Down Expand Up @@ -107,6 +118,29 @@
"pinned"
]
},
"BootEntryComposefs": {
"description": "A bootable entry",
"type": "object",
"properties": {
"bootType": {
"description": "Whether this deployment is to be booted via Type1 (vmlinuz + initrd) or Type2 (UKI) entry",
"$ref": "#/$defs/BootType"
},
"bootloader": {
"description": "Whether we boot using systemd or grub",
"$ref": "#/$defs/Bootloader"
},
"verity": {
"description": "The erofs verity",
"type": "string"
}
},
"required": [
"verity",
"bootType",
"bootloader"
]
},
"BootEntryOstree": {
"description": "A bootable entry",
"type": "object",
Expand Down Expand Up @@ -147,6 +181,28 @@
}
]
},
"BootType": {
"type": "string",
"enum": [
"Bls",
"Uki"
]
},
"Bootloader": {
"description": "Bootloader type to determine whether system was booted via Grub or Systemd",
"oneOf": [
{
"description": "Use Grub as the booloader",
"type": "string",
"const": "Grub"
},
{
"description": "Use SystemdBoot as the bootloader",
"type": "string",
"const": "Systemd"
}
]
},
"HostSpec": {
"description": "The host specification",
"type": "object",
Expand Down
26 changes: 26 additions & 0 deletions docs/src/man/bootc-composefs-finalize-staged.8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# NAME

bootc-composefs-finalize-staged - TODO: Add description

# SYNOPSIS

bootc composefs-finalize-staged

# DESCRIPTION

TODO: Add description

<!-- BEGIN GENERATED OPTIONS -->
<!-- END GENERATED OPTIONS -->

# EXAMPLES

TODO: Add practical examples showing how to use this command.

# SEE ALSO

**bootc**(8)

# VERSION

<!-- VERSION PLACEHOLDER -->
26 changes: 26 additions & 0 deletions docs/src/man/bootc-config-diff.8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# NAME

bootc-config-diff - Diff current /etc configuration versus default

# SYNOPSIS

bootc config-diff

# DESCRIPTION

Diff current /etc configuration versus default

<!-- BEGIN GENERATED OPTIONS -->
<!-- END GENERATED OPTIONS -->

# EXAMPLES

TODO: Add practical examples showing how to use this command.

# SEE ALSO

**bootc**(8)

# VERSION

<!-- VERSION PLACEHOLDER -->
14 changes: 9 additions & 5 deletions docs/src/man/bootc-install-to-disk.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,25 @@ more complex such as RAID, LVM, LUKS etc.

Instead of targeting a block device, write to a file via loopback

**--composefs-native**
**--composefs-backend**


If true, composefs backend is used, else ostree backend is used

Default: false

**--insecure**


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

Default: false

**--bootloader**=*BOOTLOADER*


The bootloader to use

Default: grub
Possible values:
- grub
- systemd

**--uki-addon**=*UKI_ADDON*

Expand Down
24 changes: 24 additions & 0 deletions docs/src/man/bootc-install-to-existing-root.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,30 @@ to be cleaned up if desired when rebooted into the new root.

Add the bootc-destructive-cleanup systemd service to delete files from the previous install on first boot

**--composefs-backend**

If true, composefs backend is used, else ostree backend is used

Default: false

**--insecure**

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

Default: false

**--bootloader**=*BOOTLOADER*

The bootloader to use

Possible values:
- grub
- systemd

**--uki-addon**=*UKI_ADDON*

Name of the UKI addons to install without the ".efi.addon" suffix. This option can be provided multiple times if multiple addons are to be installed

<!-- END GENERATED OPTIONS -->

# VERSION
Expand Down
24 changes: 24 additions & 0 deletions docs/src/man/bootc-install-to-filesystem.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,30 @@ is currently expected to be empty by default.

The stateroot name to use. Defaults to `default`

**--composefs-backend**

If true, composefs backend is used, else ostree backend is used

Default: false

**--insecure**

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

Default: false

**--bootloader**=*BOOTLOADER*

The bootloader to use

Possible values:
- grub
- systemd

**--uki-addon**=*UKI_ADDON*

Name of the UKI addons to install without the ".efi.addon" suffix. This option can be provided multiple times if multiple addons are to be installed

<!-- END GENERATED OPTIONS -->

# VERSION
Expand Down
Loading