X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=kitten%2Farch%2Fx86_64%2Fboot%2FMakefile;h=783f48dae2de495503fc4b7140de6fbb911394a9;hb=66a1a4c7a9edcd7d8bc207aca093d694a6e6b5b2;hp=28dcf2f970357d0259b5e17b390967040a43abdf;hpb=6299cb929a586fd8debcc316c1ede714d5b95979;p=palacios-OLD.git

diff --git a/kitten/arch/x86_64/boot/Makefile b/kitten/arch/x86_64/boot/Makefile
index 28dcf2f..783f48d 100644
--- a/kitten/arch/x86_64/boot/Makefile
+++ b/kitten/arch/x86_64/boot/Makefile
@@ -55,9 +55,13 @@ $(obj)/compressed/vmlwk: FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
 
 # 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"
+FDARGS = console=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,)