X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2FMakefile.am;h=622d2881ef4855f21b41a09bff6d05c57ccc809b;hp=d97dd458a97ab33be937ef2b5f31c071c13352ca;hb=3064277680ad11f887691646d0fa17bb35f38c19;hpb=9becb385b78eddb9b3817c6accaa6cdb3db0b5af

diff --git a/images/Makefile.am b/images/Makefile.am
index d97dd45..622d288 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -42,13 +42,21 @@ EXTRA_DIST = \
 	guest-aux/make-fedora-img.sh \
 	guest-aux/fedora-name.db.txt \
 	guest-aux/fedora-name.db \
-	guest-aux/make-ubuntu-img.sh
+	guest-aux/fedora-packages.db.txt \
+	guest-aux/fedora-packages.db \
+	guest-aux/make-ubuntu-img.sh \
+	guest-aux/make-windows-img.sh \
+	guest-aux/windows-software \
+	guest-aux/windows-software.reg \
+	guest-aux/windows-system \
+	guest-aux/windows-system.reg \
+	guest-aux/minimal-hive
 
 noinst_DATA = test.iso
 
 # This is 'check_DATA' because we don't need it until 'make check'
 # time and we need the tools we have built in order to make it.
-check_DATA = debian.img fedora.img ubuntu.img
+check_DATA = debian.img fedora.img ubuntu.img windows.img
 
 CLEANFILES = \
 	test.iso test.sqsh \
@@ -95,7 +103,7 @@ images_files = $(images_files_src) $(images_files_build)
 test.iso: $(images_files)
 	rm -f $@ $@-t
 	mkdir -p directory
-	$(MKISOFS) -J -r -graft-points \
+	$(GENISOIMAGE) -J -r -graft-points \
 	  -o $@-t \
 	  $(images_files) /directory=directory
 	rmdir directory
@@ -162,13 +170,22 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 	mv $@-t $@
 
 # Make a (dummy) Fedora image.
-fedora.img: guest-aux/make-fedora-img.sh guest-aux/fedora-name.db
+fedora.img: guest-aux/make-fedora-img.sh \
+		guest-aux/fedora-name.db \
+		guest-aux/fedora-packages.db
 	LIBGUESTFS_PATH=../appliance \
 	LD_LIBRARY_PATH=../src/.libs \
 	bash $<
 
 guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
-	db_load $@ < $<
+	rm -f $@ $@-t
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
+
+guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
+	rm -f $@ $@-t
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
 
 # Make a (dummy) Debian image.
 debian.img: guest-aux/make-debian-img.sh
@@ -181,3 +198,24 @@ ubuntu.img: guest-aux/make-ubuntu-img.sh
 	LIBGUESTFS_PATH=../appliance \
 	LD_LIBRARY_PATH=../src/.libs \
 	bash $<
+
+# Make a (dummy) Windows image.
+windows.img: guest-aux/make-windows-img.sh \
+	     guest-aux/windows-software guest-aux/windows-system
+	LIBGUESTFS_PATH=../appliance \
+	LD_LIBRARY_PATH=../src/.libs \
+	bash $<
+
+# Since users might not have the tools needed to create this, we
+# also distribute these files.
+guest-aux/windows-software: guest-aux/windows-software.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SOFTWARE' $<
+	mv $@-t $@
+
+guest-aux/windows-system: guest-aux/windows-system.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SYSTEM' $<
+	mv $@-t $@