X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2FMakefile.am;h=bbf3c243991417acdf213d7eef311d79aaa19e9e;hb=d4ba3d3421523b7d9da5da7c0e77df9b215b3e7d;hp=77f40d221b77bbc8b2deb3f0ad37cf787a9d16e2;hpb=a34fadf900625f1f7359ecf3ca760820ffa20815;p=libguestfs.git

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 77f40d2..bbf3c24 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = \
 	kmod.whitelist.in \
 	packagelist.in \
 	init \
-	debian/modules/install_kernel \
 	debian/modules/y0_install-guestfsd \
 	debian/modules/z99_final-cleanups \
 	debian/debirf.conf.in \
@@ -91,6 +90,9 @@ stamp-supermin: $(INITRAMFSIMG)
 	mkdir -p supermin.d
 	rm -f $@ supermin.d/base.img supermin.d/hostfiles
 	febootstrap-to-supermin $(top_builddir)/initramfs supermin.d/base.img supermin.d/hostfiles
+	if grep -q /usr/share/augeas/lenses supermin.d/hostfiles; then \
+		echo "./usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles; \
+	fi
 	touch $@
 
 supermin.d/daemon.img: $(INITRAMFSIMG)
@@ -117,37 +119,6 @@ stamp-debirf-modules:
 	done
 	touch $@
 
-#----------------------------------------------------------------------
-# Extra rules for testing the appliance.
-
-# Test-boot the appliance.
-
-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 guestfs_rescue=1" \
-	  -nographic \
-	  -serial stdio \
-	  -net channel,6666:unix:/tmp/sock,server,nowait \
-	  -net user,vlan=0 \
-	  -net nic,model=virtio,vlan=0
-
 # Make clean.
 
 CLEANFILES = packagelist kmod.whitelist