From a19e261dbe683345863b33288597391acd63084c Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 14 Jul 2021 18:12:13 +0000
Subject: [PATCH] test/data: move kickstart to the iso root

Intead of overwriting the standard ananconda kickstart file, we
move it to the root of the iso. To have anaconda pick it up an
additional kernel command line parameter is required.
---
 .../data/manifests/fedora-ostree-bootiso.json | 21 ++++++++++---------
 .../manifests/fedora-ostree-bootiso.mpp.json  | 21 +++++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-bootiso.json b/test/data/manifests/fedora-ostree-bootiso.json
index 0d28d29a..3922b57b 100644
--- a/test/data/manifests/fedora-ostree-bootiso.json
+++ b/test/data/manifests/fedora-ostree-bootiso.json
@@ -1720,11 +1720,17 @@
             "path": "99-generic/runtime-postinstall.tmpl",
             "basearch": "x86_64"
           }
-        },
+        }
+      ]
+    },
+    {
+      "name": "bootiso-tree",
+      "build": "name:build",
+      "stages": [
         {
           "type": "org.osbuild.kickstart",
           "options": {
-            "path": "/usr/share/anaconda/interactive-defaults.ks",
+            "path": "install.ks",
             "ostree": {
               "osname": "fedora",
               "url": "file:///ostree/repo",
@@ -1740,13 +1746,7 @@
               }
             }
           }
-        }
-      ]
-    },
-    {
-      "name": "bootiso-tree",
-      "build": "name:build",
-      "stages": [
+        },
         {
           "type": "org.osbuild.bootiso.mono",
           "inputs": {
@@ -1785,7 +1785,8 @@
                   "bcj": "x86"
                 }
               }
-            }
+            },
+            "kernel_opts": "inst.ks=hd:LABEL=Fedora-34-X86_64:/install.ks"
           }
         },
         {
diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.json b/test/data/manifests/fedora-ostree-bootiso.mpp.json
index cf83960e..c205d533 100644
--- a/test/data/manifests/fedora-ostree-bootiso.mpp.json
+++ b/test/data/manifests/fedora-ostree-bootiso.mpp.json
@@ -493,11 +493,17 @@
               "mpp-format-string": "{arch}"
             }
           }
-        },
+        }
+      ]
+    },
+    {
+      "name": "bootiso-tree",
+      "build": "name:build",
+      "stages": [
         {
           "type": "org.osbuild.kickstart",
           "options": {
-            "path": "/usr/share/anaconda/interactive-defaults.ks",
+            "path": "install.ks",
             "ostree": {
               "osname": "fedora",
               "url": "file:///ostree/repo",
@@ -515,13 +521,7 @@
               }
             }
           }
-        }
-      ]
-    },
-    {
-      "name": "bootiso-tree",
-      "build": "name:build",
-      "stages": [
+        },
         {
           "type": "org.osbuild.bootiso.mono",
           "inputs": {
@@ -566,6 +566,9 @@
                   "bcj": "x86"
                 }
               }
+            },
+            "kernel_opts": {
+              "mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks"
             }
           }
         },