X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=31cb6e3a22c15b0cd7a189097078b3e305ac8b1b;hp=cbc4c598a0b61fc30742c7ee11391e820d381c1a;hb=88f69eb03160a62d38a361a5ad68c6ba1e767a20;hpb=863d13ea1aadddc122ad82f4dad20e73231b48f2

diff --git a/Makefile.am b/Makefile.am
index cbc4c59..31cb6e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src daemon examples
 
 EXTRA_DIST = make-initramfs.sh
@@ -26,16 +28,50 @@ EXTRA_DIST = make-initramfs.sh
 
 fsdir = $(libdir)/guestfs
 
-fs_DATA = initramfs.$(REPO).$(host_cpu).img vmlinuz.$(REPO).$(host_cpu)
+INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
+VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
+
+fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
 
-$(fs_DATA): make-initramfs.sh.in daemon/guestfsd
-	$(builddir)/make-initramfs.sh
+$(VMLINUZ) $(INITRAMFSIMG): initramfs.timestamp
 
-.PHONY: daemon/guestfsd
+#initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
+initramfs.timestamp: make-initramfs.sh.in
+	rm -f $@
+	bash $(builddir)/make-initramfs.sh
+	touch $@
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA)
+CLEANFILES = $(fs_DATA) initramfs.timestamp emptydisk
 
 clean-local:
 	rm -rf initramfs
+
+# Test-boot the 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 -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 \
+	  -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