From fb0ec05b0d780bc6a01e10a93b707588f513d6c8 Mon Sep 17 00:00:00 2001
From: Jeremy Poulin <jpoulin@redhat.com>
Date: Tue, 17 Dec 2019 16:19:28 -0500
Subject: [PATCH 1/2] Force s390x qemu image to default to openstack config
 drive approach

---
 src/cmd-build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/cmd-build b/src/cmd-build
index 63724017ff..c85ba6085c 100755
--- a/src/cmd-build
+++ b/src/cmd-build
@@ -242,10 +242,16 @@ img_base=tmp/${imageprefix}-base.qcow2
 # forgive me for this sin
 checksum_location=$(find /usr/lib/coreos-assembler-anaconda/ -name '*CHECKSUM' | head -1)
 
+# Hack to force qemu to default to config drive based install on s390x
+platformid=qemu
+if [ "$arch" == "s390x" ]; then
+  platformid=openstack
+fi
+
 if [ -n "${build_qemu}" ]; then
     img_qemu=${imageprefix}-qemu.qcow2
     run_virtinstall "${tmprepo}" "${ref}" "${PWD}"/"${img_base}" --variant=cloud
-    /usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" qemu
+    /usr/lib/coreos-assembler/gf-platformid "$(pwd)"/"${img_base}" "$(pwd)"/"${img_qemu}" ${platformid}
 fi
 
 "${dn}"/write-commit-object "${tmprepo}" "${commit}" "$(pwd)"

From 92e2c47243f5660ead7854ade03a0ff055979aa8 Mon Sep 17 00:00:00 2001
From: Jeremy Poulin <jpoulin@redhat.com>
Date: Wed, 18 Dec 2019 14:26:49 -0500
Subject: [PATCH 2/2] Added links to online discussion around the issue

---
 src/cmd-build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cmd-build b/src/cmd-build
index c85ba6085c..fcdf629534 100755
--- a/src/cmd-build
+++ b/src/cmd-build
@@ -243,6 +243,11 @@ img_base=tmp/${imageprefix}-base.qcow2
 checksum_location=$(find /usr/lib/coreos-assembler-anaconda/ -name '*CHECKSUM' | head -1)
 
 # Hack to force qemu to default to config drive based install on s390x
+# See these PRs for relevant discussion:
+#   Long term feature request          - https://github.com/coreos/ignition/issues/825
+#   Short term workaround in ignition  - https://github.com/coreos/ignition/pull/905
+#   Related/Alternative Hack to dracut - https://github.com/coreos/ignition-dracut/pull/145
+#   Multi-Arch 4.2 CoreOS workaround   - https://github.com/coreos/coreos-assembler/pull/1004
 platformid=qemu
 if [ "$arch" == "s390x" ]; then
   platformid=openstack