Merge pull request #1070 from jlebon/pr/s390x-ignition

coreos · Mar 9, 2023 · 90b6775 · 90b6775
2 parents f7a7bca + 8fd5ee0
commit 90b6775
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 3 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -9,6 +9,7 @@ nav_order: 8
 Major changes:
 
 - Add Fedora 39 signing key; drop Fedora 36 signing key
+- iso: Support Ignition embedding on s390x by using `igninfo.json` if present
 
 Minor changes:
 

diff --git a/fixtures/iso/INDEX b/fixtures/iso/INDEX
@@ -32,3 +32,19 @@ embed-areas-2022-09.iso.xz
     features.json: installer-config, installer-config-directives,
         live-initrd-network
     installer-config-directives from 0.16.0
+
+embed-areas-2023-03.x86_64.iso.xz
+    igninfo.json pointing to ignition.img (no offset and no length)
+    kargs.json pointing to kargs areas and embedding defaults
+    miniso.dat version 1
+    features.json: installer-config, installer-config-directives,
+        live-initrd-network
+    installer-config-directives from 0.16.0
+
+embed-areas-2023-03.s390x.iso.xz
+    igninfo.json pointing to cdboot.img (offset and length)
+    no kargs.json
+    miniso.dat version 1
+    features.json: installer-config, installer-config-directives,
+        live-initrd-network
+    installer-config-directives from 0.16.0
diff --git a/fixtures/iso/embed-areas-2023-03.s390x.iso.xz b/fixtures/iso/embed-areas-2023-03.s390x.iso.xz
diff --git a/fixtures/iso/embed-areas-2023-03.x86_64.iso.xz b/fixtures/iso/embed-areas-2023-03.x86_64.iso.xz
diff --git a/src/live/embed.rs b/src/live/embed.rs
@@ -35,7 +35,8 @@ lazy_static! {
         GlobMatcher::new(&[&format!("{INITRD_NETWORK_DIR}/*")]).unwrap();
 }
 
-const COREOS_INITRD_EMBED_PATH: &str = "IMAGES/IGNITION.IMG";
+const COREOS_IGNINFO_PATH: &str = "COREOS/IGNINFO.JSO";
+const COREOS_INITRD_DEFAULT_EMBED_PATH: &str = "IMAGES/IGNITION.IMG";
 const COREOS_INITRD_HEADER_SIZE: u64 = 24;
 const COREOS_KARG_EMBED_AREA_HEADER_MAGIC: &[u8] = b"coreKarg";
 const COREOS_KARG_EMBED_AREA_HEADER_SIZE: u64 = 72;
@@ -503,14 +504,41 @@ struct InitrdEmbedArea {
     initrd: Initrd,
 }
 
+#[derive(Deserialize)]
+struct IgnInfo {
+    file: String,
+    offset: Option<u64>,
+    length: Option<usize>,
+}
+
 impl InitrdEmbedArea {
     pub fn for_iso(iso: &mut IsoFs) -> Result<Self> {
+        let igninfo: IgnInfo = match iso.get_path(COREOS_IGNINFO_PATH) {
+            Ok(record) => {
+                let f = record.try_into_file()?;
+                serde_json::from_reader(iso.read_file(&f).context("reading igninfo")?)
+                    .context("decoding igninfo")?
+            }
+            // old ISO without info JSON; assume ignition.img
+            Err(e) if e.is::<iso9660::NotFound>() => IgnInfo {
+                file: COREOS_INITRD_DEFAULT_EMBED_PATH.to_string(),
+                offset: None,
+                length: None,
+            },
+            Err(e) => return Err(e),
+        };
+
         let f = iso
-            .get_path(COREOS_INITRD_EMBED_PATH)
+            .get_path(&igninfo.file.to_uppercase())
             .context("finding initrd embed area")?
             .try_into_file()?;
+        let file_offset = igninfo.offset.unwrap_or(0);
+        let iso_offset = f.address.as_offset() + file_offset;
+        let length = igninfo
+            .length
+            .unwrap_or(f.length as usize - file_offset as usize);
         // read (checks offset/length as a side effect)
-        let mut region = Region::read(iso.as_file()?, f.address.as_offset(), f.length as usize)
+        let mut region = Region::read(iso.as_file()?, iso_offset, length)
             .context("reading initrd embed area")?;
         let initrd = if region.contents.iter().any(|v| *v != 0) {
             Initrd::from_reader(&*region.contents).context("decoding initrd embed area")?

diff --git a/tests/images.sh b/tests/images.sh
@@ -27,6 +27,8 @@ fixtures=(
     embed-areas-2021-12.iso.xz
     embed-areas-2022-02.iso.xz
     embed-areas-2022-09.iso.xz
+    embed-areas-2023-03.x86_64.iso.xz
+    embed-areas-2023-03.s390x.iso.xz
 )
 
 msg() {

diff --git a/tests/images/iso-extract-minimal-iso.sh b/tests/images/iso-extract-minimal-iso.sh
@@ -22,6 +22,11 @@ grepq() {
 iso=$1; shift
 iso=$(realpath "${iso}")
 
+if [[ "${iso}" == *.s390x.* ]]; then
+    echo "Skipped; minimal ISO not supported on s390x"
+    exit 0
+fi
+
 tmpd=$(mktemp -d)
 trap 'rm -rf "${tmpd}"' EXIT
 cd "${tmpd}"

diff --git a/tests/images/iso-kargs.sh b/tests/images/iso-kargs.sh
@@ -22,6 +22,11 @@ grepq() {
 iso=$1; shift
 iso=$(realpath "${iso}")
 
+if [[ "${iso}" == *.s390x.* ]]; then
+    echo "Skipped; kargs not supported on s390x"
+    exit 0
+fi
+
 tmpd=$(mktemp -d)
 trap 'rm -rf "${tmpd}"' EXIT
 cd "${tmpd}"