feat(efiboot): Do not automatically choose 0000 as boot id

Some implementations seem to not choose it, so let's also not do it
iTrooz · Dec 23, 2023 · 3319c15 · 3319c15
1 parent 83b7c31
commit 3319c15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/efiboot/src/cli/boot/add.rs b/efiboot/src/cli/boot/add.rs
@@ -112,7 +112,7 @@ pub fn run(
             }
             id
         } else {
-            let id = (0x0000..0xFFFF)
+            let id = (0x0001..0xFFFF)
                 .find(|&i| !used_boot_ids.contains(&i))
                 .unwrap();
             println!("Chose id {id:04X} for boot entry");

diff --git a/efiboot/src/cli/boot/tests/add.rs b/efiboot/src/cli/boot/tests/add.rs
@@ -39,7 +39,7 @@ fn add() {
     );
 
     // verify inserted entry is right
-    let (data, _) = manager.read(&Variable::new("Boot0000")).unwrap();
+    let (data, _) = manager.read(&Variable::new("Boot0002")).unwrap();
     let entry = BootEntry::parse(data).unwrap();
     assert_eq!(
         entry,
@@ -58,7 +58,7 @@ fn add() {
 
     // verify new boot order is right
     let (data, _) = manager.read(&Variable::new("BootOrder")).unwrap();
-    assert_eq!(data, utils::u16_to_u8(&[0x0000, 0x0001]));
+    assert_eq!(data, utils::u16_to_u8(&[0x0002, 0x0001]));
 }
 
 #[test]