Repository: osbuild/osbuild-composer
Pull request #3182 (2022-12-12 21:11:42)

Enable isolinux only for x86_64 (removed stage)
The previous fix (https://github.com/osbuild/osbuild-composer/commit/9e66ee13e76b431197528d119405656444cac295) only fixed half the problem with this bug.  The ISOLinux stage was still added to the iso-tree pipeline for Anaconda builds.

This is now removed.

Built and tested on an arm beaker machine with Fedora 37.

supakeen: Looks good to me, needs to be rebased/manifests need to be regenerated after the other PR that got merged to main?
achilleas-k: Well we got a nice merge conflict in the manifests (from my own PR no less), so might as well rename that variable while resolving :)
ondrejbudai: (rebased to pick up the shellcheck fix)

Patch:
diff --git a/internal/image/image_installer.go b/internal/image/image_installer.go
index da7117fbb..463574150 100644
--- a/internal/image/image_installer.go
+++ b/internal/image/image_installer.go
@@ -128,6 +128,9 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest,
 	osPipeline.Environment = img.Environment
 	osPipeline.Workload = img.Workload
 
+	// enable ISOLinux on x86_64 only
+	isoLinuxEnabled := img.Platform.GetArch() == platform.ARCH_X86_64
+
 	isoTreePipeline := manifest.NewAnacondaISOTree(m,
 		buildPipeline,
 		anacondaPipeline,
@@ -148,10 +151,11 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest,
 
 	isoTreePipeline.OSPipeline = osPipeline
 	isoTreePipeline.KernelOpts = img.AdditionalKernelOpts
+	isoTreePipeline.ISOLinux = isoLinuxEnabled
 
 	isoPipeline := manifest.NewISO(m, buildPipeline, isoTreePipeline, isoLabel)
 	isoPipeline.Filename = img.Filename
-	isoPipeline.ISOLinux = img.Platform.GetArch() == platform.ARCH_X86_64
+	isoPipeline.ISOLinux = isoLinuxEnabled
 
 	artifact := isoPipeline.Export()
 
diff --git a/internal/image/ostree_installer.go b/internal/image/ostree_installer.go
index 6639a0a1c..fac5aeeaa 100644
--- a/internal/image/ostree_installer.go
+++ b/internal/image/ostree_installer.go
@@ -95,6 +95,9 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
 	bootTreePipeline.ISOLabel = isoLabel
 	bootTreePipeline.KernelOpts = []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", isoLabel), fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", isoLabel, kspath)}
 
+	// enable ISOLinux on x86_64 only
+	isoLinuxEnabled := img.Platform.GetArch() == platform.ARCH_X86_64
+
 	isoTreePipeline := manifest.NewAnacondaISOTree(m,
 		buildPipeline,
 		anacondaPipeline,
@@ -114,10 +117,11 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
 	isoTreePipeline.PayloadPath = "/ostree/repo"
 
 	isoTreePipeline.OSTree = &img.Commit
+	isoTreePipeline.ISOLinux = isoLinuxEnabled
 
 	isoPipeline := manifest.NewISO(m, buildPipeline, isoTreePipeline, isoLabel)
 	isoPipeline.Filename = img.Filename
-	isoPipeline.ISOLinux = img.Platform.GetArch() == platform.ARCH_X86_64
+	isoPipeline.ISOLinux = isoLinuxEnabled
 	artifact := isoPipeline.Export()
 
 	return artifact, nil
diff --git a/internal/manifest/iso_tree.go b/internal/manifest/iso_tree.go
index 47557e0eb..0f327ed1d 100644
--- a/internal/manifest/iso_tree.go
+++ b/internal/manifest/iso_tree.go
@@ -46,6 +46,9 @@ type AnacondaISOTree struct {
 	OSTree     *ostree.CommitSpec
 
 	KernelOpts []string
+
+	// Enable ISOLinux stage
+	ISOLinux bool
 }
 
 func NewAnacondaISOTree(m *Manifest,
@@ -169,18 +172,21 @@ func (p *AnacondaISOTree) serialize() osbuild.Pipeline {
 	squashfsStage := osbuild.NewSquashfsStage(&squashfsOptions, p.rootfsPipeline.Name())
 	pipeline.AddStage(squashfsStage)
 
-	isoLinuxOptions := &osbuild.ISOLinuxStageOptions{
-		Product: osbuild.ISOLinuxProduct{
-			Name:    p.anacondaPipeline.product,
-			Version: p.anacondaPipeline.version,
-		},
-		Kernel: osbuild.ISOLinuxKernel{
-			Dir:  "/images/pxeboot",
-			Opts: kernelOpts,
-		},
+	if p.ISOLinux {
+		isoLinuxOptions := &osbuild.ISOLinuxStageOptions{
+			Product: osbuild.ISOLinuxProduct{
+				Name:    p.anacondaPipeline.product,
+				Version: p.anacondaPipeline.version,
+			},
+			Kernel: osbuild.ISOLinuxKernel{
+				Dir:  "/images/pxeboot",
+				Opts: kernelOpts,
+			},
+		}
+
+		isoLinuxStage := osbuild.NewISOLinuxStage(isoLinuxOptions, p.anacondaPipeline.Name())
+		pipeline.AddStage(isoLinuxStage)
 	}
-	isoLinuxStage := osbuild.NewISOLinuxStage(isoLinuxOptions, p.anacondaPipeline.Name())
-	pipeline.AddStage(isoLinuxStage)
 
 	filename := "images/efiboot.img"
 	pipeline.AddStage(osbuild.NewTruncateStage(&osbuild.TruncateStageOptions{


Test patch:
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
index 8b81a54f7..f2a8b5cdb 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
@@ -9587,31 +9587,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
index 1c94ee4d1..e0a4d1710 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
@@ -9616,31 +9616,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-image_installer-boot.json b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
index 519af8e6d..75db68b14 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -13167,31 +13167,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
index eba3ac384..41b21bc17 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
@@ -13354,31 +13354,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
index 995df42e8..92d81d30c 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
@@ -12815,30 +12815,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
index cdb50fb47..1a855c9f9 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
@@ -12968,30 +12968,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
index 9c01a3276..56690451d 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
@@ -10151,31 +10151,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-35-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
index eef38d6c7..bdf3c9297 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
@@ -10180,31 +10180,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-35-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
index 6a1eaaba5..8cac18028 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
@@ -13471,30 +13471,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
index 02e862c42..9cad3e65f 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
@@ -13632,30 +13632,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
index 92c72c27e..9d74d19d9 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
@@ -10672,31 +10672,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-36-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
index 901671d2a..9729c88e0 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
@@ -10701,31 +10701,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-36-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
index fd5dbbf3b..74bc4a082 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
@@ -13643,30 +13643,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
index b25869719..ee9993a2d 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
@@ -13820,30 +13820,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
index e8cdd1ef2..5f622491b 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
@@ -10798,31 +10798,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-37-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
index 977f21e16..04f538b7e 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
@@ -10827,31 +10827,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-37-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
index f83fec6cb..9e40848b4 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
@@ -13521,32 +13521,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.webui",
-                  "inst.webui.remote"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
index 3f20614a6..73b6d9789 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
@@ -13690,32 +13690,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.webui",
-                  "inst.webui.remote"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
index 57326ac45..6b402027d 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
@@ -10437,31 +10437,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-38-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
index 9bfe2b9d0..b0541a039 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
@@ -10466,31 +10466,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-38-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
index f5c3135af..fb0605251 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
@@ -3722,31 +3722,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
index 2264cf904..9e9bb78f4 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
@@ -3751,31 +3751,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
index cecca38c2..828e14ef5 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -5187,31 +5187,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
index 5436c24a0..e58b746cf 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
@@ -5282,31 +5282,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
index b446d5567..42a91c78a 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
@@ -9699,31 +9699,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
index 78393cdf0..f4d6e5e00 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
@@ -9728,31 +9728,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
index 31cbb4591..9fbc69a18 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
@@ -13383,31 +13383,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
index 83d580a22..4526b1959 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
@@ -13570,31 +13570,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
index fa38ebc41..cf00bbcea 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
@@ -9715,31 +9715,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
index ab3c99b84..229c3bc90 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
@@ -9744,31 +9744,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
index c346272b8..2650dcf0d 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
@@ -13407,31 +13407,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
index eff42dc68..5675e4263 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
@@ -13594,31 +13594,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {