X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=05613bbd00d7bb717cf4b269fbab27d8e82ea6b0;hb=15dbb6973a7af11b81df047194228ea86d46939b;hp=154347f37cca3dff88e4fd1c6b743117aa3012c3;hpb=6ed48042e4a8b009b5e38efbf4766a2676a33935;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 154347f..05613bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,30 +33,49 @@ VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
 
 fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
 
-$(VMLINUZ) $(INITRAMFSIMG): initramfs.timestamp
+$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
 
-initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
+initramfs/fakeroot.log: make-initramfs.sh.in
+	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
+	-mv $(VMLINUZ) $(VMLINUZ).bak
+	bash $(builddir)/make-initramfs.sh || rm -f $@
+
+$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	rm -f $@
-	$(builddir)/make-initramfs.sh
+	bash $(builddir)/update-initramfs.sh
 	touch $@
 
-.PHONY: daemon/guestfsd
-
 # Make clean.
 
-CLEANFILES = $(fs_DATA) initramfs.timestamp
+CLEANFILES = $(fs_DATA) 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