X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=93e1167937be988e2b6f96ff1932de2c18b7f1b0;hp=d692c7f4d67b3aac52a0f9ee65f1c5b3bd6ff5f5;hb=b4fade6392ccb2961f0d7e2bf45dfc2e20333aed;hpb=b7f39224e17eecf53ea2671122d4b3176e4d202f

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index d692c7f..93e1167 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -68,7 +68,7 @@ kmod.whitelist: kmod.whitelist.in
 	grep -v '^[[:space:]]*$$' < $< | grep -v '^#' > $@
 
 packagelist: packagelist.in
-	cpp -undef -DREDHAT=1 < $< | \
+	cpp -undef -D$(DIST)=1 < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@
 
 # This is for building the supermin appliance.  It has to be enabled
@@ -80,7 +80,7 @@ if SUPERMIN
 # First we need to decide which files go in and out of the supermin
 # appliance.  This decision is made by 'supermin-split.sh'.
 $(SUPERMINFILES): supermin.incfiles
-supermin.incfiles: $(top_builddir)/initramfs/fakeroot.log supermin-split.sh
+supermin.incfiles: $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd supermin-split.sh
 	rm -f supermin.incfiles $(SUPERMINFILES)
 	bash supermin-split.sh
 
@@ -92,16 +92,6 @@ $(SUPERMINIMG): supermin.incfiles supermin-make.sh
 
 endif
 
-# This should rebuild the scripts if the input files change, although
-# it doesn't always seem to work.
-%.sh: %.sh.in
-	cd .. && ./config.status appliance/$@
-	chmod +x $@
-
-libguestfs-supermin-helper: libguestfs-supermin-helper.in
-	cd .. && ./config.status appliance/$@
-	chmod +x $@
-
 #----------------------------------------------------------------------
 # Extra rules for testing the appliance.
 
@@ -126,7 +116,7 @@ test-boot-realistic: emptydisk
 	  -m 384 \
 	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
 	  -hda emptydisk \
-	  -append "console=ttyS0 guestfs=10.0.2.4:6666" \
+	  -append "console=ttyS0 guestfs=10.0.2.4:6666 guestfs_rescue=1" \
 	  -nographic \
 	  -serial stdio \
 	  -net channel,6666:unix:/tmp/sock,server,nowait \