diff --git a/Cargo.lock b/Cargo.lock index fdcd53be6..4c6646a8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,7 +222,7 @@ dependencies = [ [[package]] name = "bootc-lib" -version = "1.12.1" +version = "1.13.0" dependencies = [ "anstream", "anstyle", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index c2034fb8e..1b8490665 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -15,7 +15,7 @@ platforms = ["*-unknown-linux-gnu"] [dependencies] # Internal crates -bootc-lib = { version = "1.12", path = "../lib" } +bootc-lib = { version = "1.13", path = "../lib" } bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.1.0" } # Workspace dependencies diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 78caa7a8e..5b8217856 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -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.12.1" +version = "1.13.0" # In general we try to keep this pinned to what's in the latest RHEL9. rust-version = "1.85.0" diff --git a/docs/src/host-v1.schema.json b/docs/src/host-v1.schema.json index 75f602c8f..7f9502a9e 100644 --- a/docs/src/host-v1.schema.json +++ b/docs/src/host-v1.schema.json @@ -206,12 +206,17 @@ { "description": "Use Grub as the bootloader", "type": "string", - "const": "Grub" + "const": "grub" }, { "description": "Use SystemdBoot as the bootloader", "type": "string", - "const": "Systemd" + "const": "systemd" + }, + { + "description": "Don't use a bootloader managed by bootc", + "type": "string", + "const": "none" } ] }, diff --git a/docs/src/man/bootc-install-to-disk.8.md b/docs/src/man/bootc-install-to-disk.8.md index f1849d6fe..cae2803b3 100644 --- a/docs/src/man/bootc-install-to-disk.8.md +++ b/docs/src/man/bootc-install-to-disk.8.md @@ -142,6 +142,19 @@ its DPS type GUID, without requiring an explicit `root=` kernel argument. The stateroot name to use. Defaults to `default` +**--bootupd-skip-boot-uuid** + + Don't pass --write-uuid to bootupd during bootloader installation + +**--bootloader**=*BOOTLOADER* + + The bootloader to use + + Possible values: + - grub + - systemd + - none + **--via-loopback** Instead of targeting a block device, write to a file via loopback @@ -158,14 +171,6 @@ its DPS type GUID, without requiring an explicit `root=` kernel argument. 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 diff --git a/docs/src/man/bootc-install-to-existing-root.8.md b/docs/src/man/bootc-install-to-existing-root.8.md index 416a1268e..52152d9fe 100644 --- a/docs/src/man/bootc-install-to-existing-root.8.md +++ b/docs/src/man/bootc-install-to-existing-root.8.md @@ -198,6 +198,19 @@ of migrating the fstab entries. See the "Injecting kernel arguments" section abo The stateroot name to use. Defaults to `default` +**--bootupd-skip-boot-uuid** + + Don't pass --write-uuid to bootupd during bootloader installation + +**--bootloader**=*BOOTLOADER* + + The bootloader to use + + Possible values: + - grub + - systemd + - none + **--acknowledge-destructive** Accept that this is a destructive action and skip a warning timer @@ -218,14 +231,6 @@ of migrating the fstab entries. See the "Injecting kernel arguments" section abo 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 diff --git a/docs/src/man/bootc-install-to-filesystem.8.md b/docs/src/man/bootc-install-to-filesystem.8.md index 821827316..d3e557c7c 100644 --- a/docs/src/man/bootc-install-to-filesystem.8.md +++ b/docs/src/man/bootc-install-to-filesystem.8.md @@ -106,6 +106,19 @@ is currently expected to be empty by default. The stateroot name to use. Defaults to `default` +**--bootupd-skip-boot-uuid** + + Don't pass --write-uuid to bootupd during bootloader installation + +**--bootloader**=*BOOTLOADER* + + The bootloader to use + + Possible values: + - grub + - systemd + - none + **--composefs-backend** If true, composefs backend is used, else ostree backend is used @@ -118,15 +131,6 @@ is currently expected to be empty by default. Default: false -**--bootloader**=*BOOTLOADER* - - The bootloader to use - - Possible values: - - grub - - systemd - - none - **--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