X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2FMakefile.am;h=ff6bc5d531ce58729a5d24f5fe0b2ecbf0916c4a;hb=f9071160c1a5fe21a825398a81ba3ca584892a4e;hp=424f5e458e8e13eb562fb9ad3a5fe7d7d9ffdd24;hpb=bf2b08560f649c22152e4138531ad0b46b4ad1b3;p=libguestfs.git

diff --git a/images/Makefile.am b/images/Makefile.am
index 424f5e4..ff6bc5d 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -35,14 +35,14 @@ EXTRA_DIST = \
 	lib-x86_64.so \
 	test-grep.txt
 
-noinst_DATA = test.sqsh
+noinst_DATA = test.iso
 
 CLEANFILES = \
-	test.sqsh \
+	test.iso test.sqsh \
 	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
 	initrd
 
-squash_files_src = \
+images_files_src = \
 	$(srcdir)/helloworld.tar \
 	$(srcdir)/helloworld.tar.gz \
 	$(srcdir)/empty \
@@ -63,7 +63,7 @@ squash_files_src = \
 	$(srcdir)/lib-x86_64.so \
 	$(srcdir)/test-grep.txt
 
-squash_files_build = \
+images_files_build = \
 	$(builddir)/100kallzeroes \
 	$(builddir)/100kallnewlines \
 	$(builddir)/100kallspaces \
@@ -74,11 +74,16 @@ squash_files_build = \
 	$(builddir)/initrd-x86_64.img.gz \
 	$(builddir)/test-grep.txt.gz
 
-squash_files = $(squash_files_src) $(squash_files_build)
+images_files = $(images_files_src) $(images_files_build)
 
-test.sqsh: $(squash_files)
-	rm -f $@
-	$(MKSQUASHFS) $(squash_files) $@
+test.iso: $(images_files)
+	rm -f $@ $@-t
+	mkdir -p directory
+	$(MKISOFS) -J -r -graft-points \
+	  -o $@-t \
+	  $(images_files) /directory=directory
+	rmdir directory
+	mv $@-t $@
 
 $(builddir)/100kallzeroes:
 	rm -f $@ $@-t
@@ -109,7 +114,7 @@ $(builddir)/10klines:
 	done > $@-t
 	mv $@-t $@
 
-$(builddir)/initrd: empty known-1 known-2 known-3
+$(builddir)/initrd: empty known-1 known-2 known-3 known-4 known-5
 	rm -f $@ $@-t
 	for f in $^; do echo $$f; done | cpio -o -H newc | gzip --best > $@-t
 	mv $@-t $@