From 14b31c5f00161e165104035f0db9c111e527a33a Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Wed, 18 Jul 2012 12:18:15 +0200
Subject: [PATCH 1/2] comps: install qvm-tools documentation

---
 conf/comps-qubes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index f7ba76a..920b180 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -100,6 +100,7 @@
       <packagereq type="mandatory">qubes-logos</packagereq>
       <packagereq type="mandatory">qubes-manager</packagereq>
       <packagereq type="mandatory">qubes-template-fedora-15-x64</packagereq>
+      <packagereq type="default">qubes-doc-dom0</packagereq>
       <packagereq type="default">qubes-gpg-split-dom0</packagereq>
     </packagelist>
   </group>

From ad83f834d2e65f983233adc20842fb27aacb9347 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 14 Jun 2012 03:08:21 +0200
Subject: [PATCH 2/2] anaconda: treat pvops kernel as qubes kernel

---
 anaconda/booty/x86.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anaconda/booty/x86.py b/anaconda/booty/x86.py
index 0299685..ff7eb52 100644
--- a/anaconda/booty/x86.py
+++ b/anaconda/booty/x86.py
@@ -349,7 +349,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
 
                 if initrd:
                     f.write('\tmodule %s%s\n' % (cfPath, initrd))
-            elif version.find("xenlinux") >= 0:
+            elif version.find("xenlinux") >= 0 || version.find("pvops") >= 0:
                 # Qubes kernel
                 hvFile = "%sxen.gz" %(cfPath)
                 f.write('\tkernel %s console=com1\n' %(hvFile,))