Use correct file name when loading boot config file

phil-opp · phil-opp · commit 510a44bc357b · 2023-01-30T08:39:33.000+01:00
diff --git a/bios/stage-2/src/main.rs b/bios/stage-2/src/main.rs
@@ -115,7 +115,7 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
     }
     let config_file_start = ramdisk_start.wrapping_add(ramdisk_len.try_into().unwrap());
     let config_file_len = try_load_file(
-        "config.json",
+        "boot.json",
         config_file_start,
         &mut fs,
         &mut disk,
diff --git a/uefi/src/main.rs b/uefi/src/main.rs
@@ -219,7 +219,7 @@ fn load_config_file(
     st: &mut SystemTable<Boot>,
     boot_mode: BootMode,
 ) -> Option<&'static mut [u8]> {
-    load_file_from_boot_method(image, st, "config.json\0", boot_mode)
+    load_file_from_boot_method(image, st, "boot.json\0", boot_mode)
 }
 
 fn load_kernel(

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {`
`115`	`115`	`}`
`116`	`116`	`let config_file_start = ramdisk_start.wrapping_add(ramdisk_len.try_into().unwrap());`
`117`	`117`	`let config_file_len = try_load_file(`
`118`		`- "config.json",`
	`118`	`+ "boot.json",`
`119`	`119`	`config_file_start,`
`120`	`120`	`&mut fs,`
`121`	`121`	`&mut disk,`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ fn load_config_file(`
`219`	`219`	`st: &mut SystemTable<Boot>,`
`220`	`220`	`boot_mode: BootMode,`
`221`	`221`	`) -> Option<&'static mut [u8]> {`
`222`		`- load_file_from_boot_method(image, st, "config.json\0", boot_mode)`
	`222`	`+ load_file_from_boot_method(image, st, "boot.json\0", boot_mode)`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`fn load_kernel(`