X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=2286dd5d8db8ec25026afee364e50fd1db79b231;hp=a65c9d7794d375373ca25f309591043bbc2e6a6b;hb=cead6fe22d32e8fcdb26c60fdad5db49bf3f0ec0;hpb=1957e9ed3402120f4868dcea04abb51ceb44df30

diff --git a/Makefile.am b/Makefile.am
index a65c9d7..2286dd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,8 @@ EXTRA_DIST = \
 	recipes/*.sh \
 	recipes/*.example \
 	html/recipes.css \
-	make-recipes.sh
+	make-recipes.sh \
+	test-cleanup.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -80,6 +81,9 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	bash $(top_builddir)/update-initramfs.sh
 	touch $@
 
+make-initramfs.sh: make-initramfs.sh.in
+	./config.status $@
+
 # Tests.  These are auto-generated from the test descriptions.
 
 check_PROGRAMS = tests
@@ -194,11 +198,11 @@ test-boot-realistic: emptydisk
 	  -serial stdio \
 	  -net channel,6666:unix:/tmp/sock,server,nowait \
 	  -net user,vlan=0 \
-	  -net nic,vlan=0
+	  -net nic,model=virtio,vlan=0
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~ recipes/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
 
 clean-local:
 	rm -rf initramfs