From d43848d163d278b96f1a4a4954d0b291093e4cf8 Mon Sep 17 00:00:00 2001
From: Zrubi <mail@zrubi.hu>
Date: Tue, 2 Jun 2015 09:19:54 +0200
Subject: [PATCH] YML output fix

(cherry picked from commit 60cf12b4fdea0d119c1b8ca0c84f77bd4877f843)
---
 qvm-tools/qubes-hcl-report | 72 ++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/qvm-tools/qubes-hcl-report b/qvm-tools/qubes-hcl-report
index cf62c65f..daf086f3 100755
--- a/qvm-tools/qubes-hcl-report
+++ b/qvm-tools/qubes-hcl-report
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-VERSION=2.3
+VERSION=2.4
 COPY2VM="dom0"
 SUPPORT_FILES=0
 
@@ -156,43 +156,61 @@ echo -e "TPM:\t\t$TPM"
 echo
 
 echo -e "
+
 ---
-layout:	'hcl'
-brand:  '$BRAND'
-model:  '$PRODUCT'
-type:  '$TYPE'
-bios:  '$BIOS'
-ram:  '$RAM'
-hvm:  '$HVM'
-iommu:  '$IOMMU'
-tpm:  '$TPM_s'
-cpu-short:  'FIXME'
-cpu:  |
+layout:
+  'hcl'
+type:
+  '$TYPE'
+hvm:
+  '$HVM'
+iommu:
+  '$IOMMU'
+tpm:
+  '$TPM_s'
+brand: |
+  $BRAND
+model: |
+  $PRODUCT
+bios: |
+  $BIOS
+cpu: |
 $CPU
-chipset-sort:  'FIXME'
-chipset:  |
+cpu-short: |
+  FIXME
+chipset: |
 $CHIPSET
-gpu-short:  'FIXME'
-gpu:  |
+chipset-short: |
+  FIXME
+gpu: |
 $VGA
-network:  |
+gpu-short: |
+  FIXME
+network: |
 $NET
-scsi:  |
+memory: |
+  $RAM
+scsi: |
 $SCSI
 
 versions:
 
-- qubes:  '$QUBES'
-  xen:  '$XEN_MAJOR.$XEN_MINOR$XEN_EXTRA'
-  kernel:  '$KERNEL'
-  works:  'FIXME'
+- works:
+    'FIXME:yes|no|partial'
+  qubes: |
+    $QUBES
+  xen: |
+    $XEN_MAJOR.$XEN_MINOR$XEN_EXTRA
+  kernel: |
+    $KERNEL
+  remark: |
+    FIXME
+  credit: |
+    FIXAUTHOR
+  link: |
+    FIXLINK
 
-  remark:  |
-    FIXME
-  credit:  |
-    FIXME
 ---
-# vim: ts=2 sw=2 et nowrap
 " >> $HOME/$FILENAME.yml