Reboot in order to set serial

Author: jackpot51

res/firmware.nsh

@@ -208,5 +208,23 @@ if "%2" == "ec2" then
     exit 1
 endif
 
+if "%2" == "serial" then
+    if exist amide.efi then
+        if exist amide.tag then
+            rm amide.tag
+            amide.efi /SS "%3"
+            exit %lasterror%
+        else
+            echo > amide.tag
+            if not exist amide.tag then
+                echo "failed to create amide.tag"
+                exit 1
+            endif
+
+            reset
+        endif
+    endif
+endif
+
 echo "unknown command '%2'"
 exit 1

src/app/bios.rs

@@ -13,7 +13,7 @@ use std::vars::{get_boot_item, get_boot_order, set_boot_item, set_boot_order};
 use std::uefi::reset::ResetType;
 use std::uefi::status::{Error, Result, Status};
 
-use super::{AMIDE, FIRMWARECAP, FIRMWAREDIR, FIRMWARENSH, FIRMWAREROM, H2OFFT, IFLASHV, SERIAL, UEFIFLASH, shell, Component, pci_mcfg, UefiMapper};
+use super::{FIRMWARECAP, FIRMWAREDIR, FIRMWARENSH, FIRMWAREROM, H2OFFT, IFLASHV, UEFIFLASH, shell, Component, pci_mcfg, UefiMapper};
 
 fn copy_region(region: intelflash::RegionKind, old_data: &[u8], new_data: &mut [u8]) -> core::result::Result<bool, String> {
     let old_opt = intelflash::Rom::new(old_data)?.get_region_base_limit(region)?;
@@ -188,23 +188,6 @@ impl BiosComponent {
             println!("Failed to locate EC");
         }
     }
-
-    fn set_serial(&self, serial: &str) -> Result<()> {
-        if find(AMIDE).is_ok() {
-            let cmd = format!("{} /SS {}", AMIDE, serial);
-            let status = shell(&cmd)?;
-
-            if status == 0 {
-                Ok(())
-            } else {
-                println!("{} Set Serial Error: {}", self.name(), status);
-                Err(Error::DeviceError)
-            }
-        } else {
-            //TODO
-            Err(Error::NotFound)
-        }
-    }
 }
 
 impl Component for BiosComponent {
@@ -558,25 +541,6 @@ impl Component for BiosComponent {
             }
         }
 
-        if let Ok(serial_vec) = load(SERIAL) {
-            match String::from_utf8(serial_vec) {
-                Ok(serial_str) => {
-                    let serial = serial_str.trim();
-                    match self.set_serial(&serial) {
-                        Ok(()) => {
-                            println!("Set serial to '{}'", serial);
-                        },
-                        Err(err) => {
-                            println!("Failed to set serial to '{}': {:?}", serial, err);
-                        }
-                    }
-                },
-                Err(err) => {
-                    println!("Failed to parse serial: {:?}", err);
-                }
-            }
-        }
-
         Ok(())
     }
 }

src/app/mod.rs

@@ -38,7 +38,7 @@ mod ec;
 mod mapper;
 mod pci;
 
-static AMIDE: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\amide.efi");
+static AMIDETAG: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\amide.tag");
 static ECROM: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\ec.rom");
 static ECTAG: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\ec.tag");
 static EC2ROM: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\ec2.rom");
@@ -79,6 +79,18 @@ fn ac_connected() -> bool {
     }
 }
 
+fn set_serial(serial: &str) -> Result<()> {
+    find(FIRMWARENSH)?;
+    let cmd = format!("{} {} serial {}", FIRMWARENSH, FIRMWAREDIR, serial);
+    let status = shell(&cmd)?;
+    if status == 0 {
+        Ok(())
+    } else {
+        println!("Set Serial Error: {}", status);
+        Err(Error::DeviceError)
+    }
+}
+
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 enum ValidateKind {
     Found,
@@ -257,6 +269,11 @@ fn inner() -> Result<()> {
             components.clear();
             validations.clear();
             '\n'
+        } else if find(AMIDETAG).is_ok() {
+            // Skip enter if writing serial
+            components.clear();
+            validations.clear();
+            '\n'
         } else if find(UEFIFLASH).is_ok() {
             // Skip enter if flashing a meerkat
             if find(UEFIFLASHTAG).is_ok() {
@@ -319,6 +336,25 @@ fn inner() -> Result<()> {
         }
     };
 
+    if let Ok(serial_vec) = load(SERIAL) {
+        match String::from_utf8(serial_vec) {
+            Ok(serial_str) => {
+                let serial = serial_str.trim();
+                match set_serial(&serial) {
+                    Ok(()) => {
+                        println!("Set serial to '{}'", serial);
+                    },
+                    Err(err) => {
+                        println!("Failed to set serial to '{}': {:?}", serial, err);
+                    }
+                }
+            },
+            Err(err) => {
+                println!("Failed to parse serial: {:?}", err);
+            }
+        }
+    }
+
     remove_override(option)?;
 
     println!("{}", message);