From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Tue, 21 Oct 2008 21:53:34 +0000 (-0500)
Subject: Use the puppy linux iso instead of the init_task for V3VEE development
X-Git-Tag: 1.0^2~32^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios-OLD.git;a=commitdiff_plain;h=8bbdb0f7364d71ecc094eab4e741043cb6e6db49

Use the puppy linux iso instead of the init_task for V3VEE development
---

diff --git a/kitten/arch/x86_64/boot/Makefile b/kitten/arch/x86_64/boot/Makefile
index 28dcf2f..7f3f363 100644
--- a/kitten/arch/x86_64/boot/Makefile
+++ b/kitten/arch/x86_64/boot/Makefile
@@ -57,7 +57,11 @@ $(obj)/compressed/vmlwk: FORCE
 # Set this if you want to pass append arguments to the isoimage kernel
 FDARGS = console=vga,serial debug_mptable=1 init_argv="one two three" init_envp="one=1 two=2 three=3"
 # Set this if you want an initrd included with the isoimage kernel
+ifdef CONFIG_V3VEE
+FDINITRD = /opt/vmm-tools/isos/puppy.iso
+else
 FDINITRD = init_task
+endif
 
 image_cmdline = default lwk $(FDARGS) $(if $(FDINITRD),initrd=initrd.img,)