From 0d7c04bd5348d366439b61f27b8c72d1e79477cd Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 25 Feb 2013 01:01:37 +0100
Subject: [PATCH] lorax: do not build boot.iso (#706)

---
 Makefile                                 |  2 --
 lorax-templates-qubes/templates/x86.tmpl | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index f200563..6639705 100644
--- a/Makefile
+++ b/Makefile
@@ -139,8 +139,6 @@ iso:
 	mkdir -p work
 	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
 	./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
-	# Currently netinstall not supported
-	rm work/$(ISO_VERSION)/x86_64/iso/*-netinst.iso
 	# Move result files to known-named directories
 	mkdir -p build/ISO/qubes-x86_64/iso build/work
 	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/
diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl
index 08c1364..84fb7d0 100644
--- a/lorax-templates-qubes/templates/x86.tmpl
+++ b/lorax-templates-qubes/templates/x86.tmpl
@@ -80,14 +80,14 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
 %endif
 
-## make boot.iso
-runcmd mkisofs -o ${outroot}/images/boot.iso \
-       -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
-       -boot-load-size 4 -boot-info-table -no-emul-boot \
-       ${efiargs} -R -J -V '${isolabel}' -T -graft-points \
-       ${BOOTDIR}=${outroot}/${BOOTDIR} \
-       ${KERNELDIR}=${outroot}/${KERNELDIR} \
-       ${LIVEDIR}=${outroot}/${LIVEDIR} \
-       ${efigraft}
-runcmd isohybrid ${efihybrid} ${outroot}/images/boot.iso
-treeinfo images-${basearch} boot.iso images/boot.iso
+## ## make boot.iso
+## runcmd mkisofs -o ${outroot}/images/boot.iso \
+##        -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
+##        -boot-load-size 4 -boot-info-table -no-emul-boot \
+##        ${efiargs} -R -J -V '${isolabel}' -T -graft-points \
+##        ${BOOTDIR}=${outroot}/${BOOTDIR} \
+##        ${KERNELDIR}=${outroot}/${KERNELDIR} \
+##        ${LIVEDIR}=${outroot}/${LIVEDIR} \
+##        ${efigraft}
+## runcmd isohybrid ${efihybrid} ${outroot}/images/boot.iso
+## treeinfo images-${basearch} boot.iso images/boot.iso