diff --git a/OSDK.toml b/OSDK.toml index 79e819031..5d9f6c0e0 100644 --- a/OSDK.toml +++ b/OSDK.toml @@ -6,7 +6,7 @@ method = "grub-rescue-iso" [grub] -protocol = "multiboot2" +boot_protocol = "multiboot2" [qemu] args = "$(./tools/qemu_args.sh normal)" diff --git a/book/src/osdk/guide/intel-tdx.md b/book/src/osdk/guide/intel-tdx.md index 214f7c25c..f23ee7551 100644 --- a/book/src/osdk/guide/intel-tdx.md +++ b/book/src/osdk/guide/intel-tdx.md @@ -50,7 +50,7 @@ For example, you can append the following TDX-specific scheme to your `OSDK.toml supported_archs = ["x86_64"] boot.method = "grub-qcow2" grub.mkrescue_path = "~/tdx-tools/grub" -grub.protocol = "linux" +grub.boot_protocol = "linux" qemu.args = """\ -accel kvm \ -m 8G \ diff --git a/book/src/osdk/reference/manifest.md b/book/src/osdk/reference/manifest.md index 5d98bf862..c2d6c1a3c 100644 --- a/book/src/osdk/reference/manifest.md +++ b/book/src/osdk/reference/manifest.md @@ -44,7 +44,7 @@ init_args = ["sh", "-l"] # <11> initramfs = "path/to/it" # <12> [grub] # <13> mkrescue_path = "path/to/it" # <14> -protocol = "multiboot2" # <15> +boot_protocol = "multiboot2" # <15> display_grub_menu = false # <16> [qemu] # <17> path = "path/to/it" # <18> diff --git a/osdk/src/config/test/OSDK.toml.full b/osdk/src/config/test/OSDK.toml.full index 3ec57257a..1d084c995 100644 --- a/osdk/src/config/test/OSDK.toml.full +++ b/osdk/src/config/test/OSDK.toml.full @@ -21,7 +21,7 @@ boot.initramfs = "/tmp/osdk_test_file" boot.method = "qemu-direct" [grub] -protocol = "multiboot2" +boot_protocol = "multiboot2" display_grub_menu = true [qemu]