Merge pull request coreos#685 from HuijingHei/anaconda-label

efi: sync bootentry label with Anaconda

Author: cgwalters

Cargo.lock

@@ -34,6 +34,7 @@ openat = "0.1.20"
 openat-ext = ">= 0.2.2, < 0.3.0"
 openssl = "^0.10"
 os-release = "0.1.0"
+regex = "1.10.4"
 rustix = { version = "0.38.34", features = ["process", "fs"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"

Cargo.toml

@@ -139,17 +139,28 @@ impl Efi {
             log::debug!("Not booted via EFI, skipping firmware update");
             return Ok(());
         }
-        // Read /etc/os-release
-        let release: OsRelease = OsRelease::new()?;
-        let product_name: &str = &release.name;
+        let product_name = get_product_name()?;
         log::debug!("Get product name: {product_name}");
         assert!(product_name.len() > 0);
         // clear all the boot entries that match the target name
-        clear_efi_target(product_name)?;
-        create_efi_boot_entry(device, espdir, vendordir, product_name)
+        clear_efi_target(&product_name)?;
+        create_efi_boot_entry(device, espdir, vendordir, &product_name)
     }
 }
 
+#[context("Get product name")]
+fn get_product_name() -> Result<String> {
+    let file_path = Path::new("/etc/system-release");
+    if file_path.exists() {
+        let content = std::fs::read_to_string(file_path)?;
+        let re = regex::Regex::new(r" *release.*").unwrap();
+        return Ok(re.replace_all(&content, "").to_string());
+    }
+    // Read /etc/os-release
+    let release: OsRelease = OsRelease::new()?;
+    Ok(release.name)
+}
+
 /// Convert a nul-terminated UTF-16 byte array to a String.
 fn string_from_utf16_bytes(slice: &[u8]) -> String {
     // For some reason, systemd appends 3 nul bytes after the string.
@@ -659,4 +670,10 @@ Boot0003* test";
         );
         Ok(())
     }
+    #[test]
+    fn test_get_product_name() -> Result<()> {
+        let name = get_product_name()?;
+        assert!(name.len() > 0);
+        Ok(())
+    }
 }