From 2c2f035c61d0d4c68ceaa1f141938b69d7401c0a Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 24 Jan 2013 11:54:44 +0100
Subject: [PATCH] lorax: qubes customized templates

---
 .../templates/config_files/x86/isolinux.cfg      | 16 ++++++++--------
 .../templates/runtime-install.tmpl               |  7 +++++--
 lorax-templates-qubes/templates/x86.tmpl         |  2 ++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg b/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg
index bc5a2f6..20278c0 100644
--- a/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg
+++ b/lorax-templates-qubes/templates/config_files/x86/isolinux.cfg
@@ -58,13 +58,13 @@ menu separator # insert an empty line
 menu separator # insert an empty line
 label linux
   menu label ^Install @PRODUCT@
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet
+  kernel mboot.c32
+  append xen.gz --- vmlinuz @ROOT@ quiet --- initrd.img
 label check
   menu label Test this ^media & install @PRODUCT@
   menu default
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet rd.live.check
+  kernel mboot.c32
+  append xen.gz --- vmlinuz @ROOT@ quiet rd.live.check --- initrd.img
 menu separator # insert an empty line
 # utilities submenu
 menu begin ^Troubleshooting
@@ -76,8 +76,8 @@ label vesa
 	Try this option out if you're having trouble installing
 	@PRODUCT@.
   endtext
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet
+  kernel mboot.c32
+  append xen.gz --- vmlinuz @ROOT@ xdriver=vesa nomodeset quiet --- initrd.img
 label rescue
   menu indent count 5
   menu label ^Rescue a @PRODUCT@ system
@@ -85,8 +85,8 @@ label rescue
 	If the system will not boot, this lets you access files
 	and edit config files to try to get it booting again.
   endtext
-  kernel vmlinuz
-  append initrd=initrd.img @ROOT@ rescue quiet
+  kernel mboot.c32
+  append xen.gz --- vmlinuz @ROOT@ rescue quiet --- initrd.img
 label memtest
   menu label Run a ^memory test
   text help
diff --git a/lorax-templates-qubes/templates/runtime-install.tmpl b/lorax-templates-qubes/templates/runtime-install.tmpl
index ab35fbb..2914d24 100644
--- a/lorax-templates-qubes/templates/runtime-install.tmpl
+++ b/lorax-templates-qubes/templates/runtime-install.tmpl
@@ -1,6 +1,8 @@
 ## lorax template file: populate the ramdisk (runtime image)
 <%page args="basearch, product"/>
 
+installpkg python
+
 ## anaconda package
 installpkg anaconda anaconda-widgets
 ## anaconda deps that aren't in the RPM
@@ -19,6 +21,7 @@ installpkg kernel
     installpkg *-firmware
     installpkg b43-openfwwf
 %endif
+installpkg xen-hypervisor
 
 ## arch-specific packages (bootloaders etc.)
 %if basearch in ("arm", "armhfp"):
@@ -48,7 +51,7 @@ installpkg plymouth
 installpkg dracut-network anaconda-dracut
 
 ## fedup-dracut handles upgrades
-installpkg fedup-dracut fedup-dracut-plymouth *-fedup-dracut
+##installpkg fedup-dracut fedup-dracut-plymouth *-fedup-dracut
 
 ## rpcbind or portmap needed by dracut nfs module
 installpkg rpcbind
@@ -93,7 +96,7 @@ installpkg mt-st hdparm smartmontools
 installpkg libmlx4
 
 ## translations & language packs
-installpkg yum-langpacks specspo
+##installpkg yum-langpacks specspo
 
 ## fonts & themes
 installpkg bitmap-fangsongti-fonts
diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl
index 30041ee..08c1364 100644
--- a/lorax-templates-qubes/templates/x86.tmpl
+++ b/lorax-templates-qubes/templates/x86.tmpl
@@ -16,6 +16,8 @@ treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 mkdir ${BOOTDIR}
 install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
 install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
+install ${SYSLINUXDIR}/mboot.c32 ${BOOTDIR}
+install boot/xen*gz ${BOOTDIR}
 install ${configdir}/isolinux.cfg ${BOOTDIR}
 install ${configdir}/boot.msg ${BOOTDIR}
 install ${configdir}/grub.conf ${BOOTDIR}