X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=c06d7ae9593ccc4dc4fc0f8e85b43690cd63d061;hp=d692c7f4d67b3aac52a0f9ee65f1c5b3bd6ff5f5;hb=215041c7178922341ecbfdb23eb203f2bb8c29c4;hpb=b7f39224e17eecf53ea2671122d4b3176e4d202f diff --git a/appliance/Makefile.am b/appliance/Makefile.am index d692c7f..c06d7ae 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -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 \