From 50f523f4e86a64fd2a313b1f423baed663cca968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Thu, 7 Sep 2017 15:07:38 +0200
Subject: [PATCH] Move Workstation Ostree installer to separate variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Creating the image requires running lorax. There is however already one
lorax instance being run in the buildinstall phase. When the second one
runs, it overwrites the outputs from first one and people expecting to
boot netinst over PXE are instead getting ostree workstation.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1477916
Relates: https://pagure.io/pungi/issue/695
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 fedora.conf         | 2 +-
 variants-fedora.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/fedora.conf b/fedora.conf
index 2729cdb..8af3703 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -802,7 +802,7 @@ ostree_installer = [
             'failable': ['*'],
         }
     }),
-    ("^Workstation$", {
+    ("^WorkstationOstree$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 646f3b7..331f7f6 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -133,6 +133,14 @@
             <package>fedora-productimg-workstation</package>
         </buildinstallpackages>
     </variant>
+    <variant id="WorkstationOstree" name="Workstation Ostree" type="variant" is_empty="true">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>armhfp</arch>
+            <arch>i386</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
     <variant name="Cloud" id="Cloud" type="variant">
         <arches>
             <arch>aarch64</arch>