X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=31cb6e3a22c15b0cd7a189097078b3e305ac8b1b;hp=154347f37cca3dff88e4fd1c6b743117aa3012c3;hb=88f69eb03160a62d38a361a5ad68c6ba1e767a20;hpb=6ed48042e4a8b009b5e38efbf4766a2676a33935;ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 154347f..31cb6e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,28 +35,43 @@ fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
 
 $(VMLINUZ) $(INITRAMFSIMG): initramfs.timestamp
 
-initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
+#initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
+initramfs.timestamp: make-initramfs.sh.in
 	rm -f $@
-	$(builddir)/make-initramfs.sh
+	bash $(builddir)/make-initramfs.sh
 	touch $@
 
-.PHONY: daemon/guestfsd
-
 # Make clean.
 
-CLEANFILES = $(fs_DATA) initramfs.timestamp
+CLEANFILES = $(fs_DATA) initramfs.timestamp emptydisk
 
 clean-local:
 	rm -rf initramfs
 
 # Test-boot the image.
 
-test-boot-image:
+test-boot: emptydisk
+	qemu-system-$(host_cpu) \
+	  -m 384 \
+	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
+	  -hda emptydisk
+
+emptydisk:
 	rm -f emptydisk
 	dd if=/dev/zero of=emptydisk bs=1024 count=1440
-	echo 0, | sfdisk -C 80 -H 2 -S 18 emptydisk
+	echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
+
+# This is a more realistic test boot command line which better
+# reflects what the library does.
+
+test-boot-realistic: emptydisk
 	qemu-system-$(host_cpu) \
 	  -m 384 \
 	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-	  -hda emptydisk -boot c
-	rm -f emptydisk
+	  -hda emptydisk \
+	  -append "console=ttyS0 guestfs=10.0.2.4:6666" \
+	  -nographic \
+	  -serial stdio \
+	  -net channel,6666:unix:/tmp/sock,server,nowait \
+	  -net user,vlan=0 \
+	  -net nic,vlan=0