diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | images/Makefile.am | 14 | ||||
| -rwxr-xr-x | images/guest-aux/make-debian-img.sh | 6 | ||||
| -rwxr-xr-x | images/guest-aux/make-fedora-img.sh | 4 | ||||
| -rwxr-xr-x | images/guest-aux/make-ubuntu-img.sh | 6 | ||||
| -rwxr-xr-x | images/guest-aux/make-windows-img.sh | 8 | ||||
| -rwxr-xr-x | run.in (renamed from run) | 5 |
8 files changed, 23 insertions, 23 deletions
@@ -306,6 +306,7 @@ ruby/ext/guestfs/_guestfs.c ruby/ext/guestfs/_guestfs.so ruby/ext/guestfs/mkmf.log ruby/Rakefile +run src/actions.c src/bindtests.c src/errnostring_gperf.c diff --git a/configure.ac b/configure.ac index 54c29119..e45632da 100644 --- a/configure.ac +++ b/configure.ac @@ -909,6 +909,8 @@ AC_CONFIG_HEADERS([config.h]) dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html AC_CONFIG_FILES([podwrapper.sh], [chmod +x podwrapper.sh]) +AC_CONFIG_FILES([run], + [chmod +x run]) AC_CONFIG_FILES([Makefile appliance/Makefile capitests/Makefile diff --git a/images/Makefile.am b/images/Makefile.am index 68eb5506..90c4ce31 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -173,41 +173,39 @@ $(builddir)/test-grep.txt.gz: test-grep.txt fedora.img: guest-aux/make-fedora-img.sh \ guest-aux/fedora-name.db \ guest-aux/fedora-packages.db - LIBGUESTFS_PATH=$(top_builddir)/appliance \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ TMPDIR=$(top_builddir) \ + SRCDIR=$(srcdir) \ bash $< guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt rm -f $@ $@-t + mkdir -p guest-aux $(DB_LOAD) $@-t < $< mv $@-t $@ guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt rm -f $@ $@-t + mkdir -p guest-aux $(DB_LOAD) $@-t < $< mv $@-t $@ # Make a (dummy) Debian image. debian.img: guest-aux/make-debian-img.sh - LIBGUESTFS_PATH=$(top_builddir)/appliance \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ TMPDIR=$(top_builddir) \ + SRCDIR=$(srcdir) \ bash $< # Make a (dummy) Ubuntu image. ubuntu.img: guest-aux/make-ubuntu-img.sh - LIBGUESTFS_PATH=$(top_builddir)/appliance \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ TMPDIR=$(top_builddir) \ + SRCDIR=$(srcdir) \ bash $< # Make a (dummy) Windows image. windows.img: guest-aux/make-windows-img.sh \ guest-aux/windows-software guest-aux/windows-system - LIBGUESTFS_PATH=$(top_builddir)/appliance \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ TMPDIR=$(top_builddir) \ + SRCDIR=$(srcdir) \ bash $< # Since users might not have the tools needed to create this, we diff --git a/images/guest-aux/make-debian-img.sh b/images/guest-aux/make-debian-img.sh index 9a01e938..4b0490df 100755 --- a/images/guest-aux/make-debian-img.sh +++ b/images/guest-aux/make-debian-img.sh @@ -31,7 +31,7 @@ LABEL=BOOT /boot ext2 default 0 0 EOF # Create a disk image. -../run ../fish/guestfish <<'EOF' +../run ../fish/guestfish <<EOF sparse debian.img.tmp 512M run @@ -80,9 +80,9 @@ upload fstab.tmp /etc/fstab write /etc/debian_version "5.0.1" write /etc/hostname "debian.invalid" -upload guest-aux/debian-packages /var/lib/dpkg/status +upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status -upload bin-x86_64-dynamic /bin/ls +upload ${SRCDIR}/bin-x86_64-dynamic /bin/ls mkdir /boot/grub touch /boot/grub/grub.conf diff --git a/images/guest-aux/make-fedora-img.sh b/images/guest-aux/make-fedora-img.sh index a0384327..3d6c471a 100755 --- a/images/guest-aux/make-fedora-img.sh +++ b/images/guest-aux/make-fedora-img.sh @@ -31,7 +31,7 @@ LABEL=ROOT / ext2 default 0 0 EOF # Create a disk image. -../run ../fish/guestfish <<'EOF' +../run ../fish/guestfish <<EOF sparse fedora.img.tmp 512M run @@ -75,7 +75,7 @@ write /etc/sysconfig/network "HOSTNAME=fedora.invalid" upload guest-aux/fedora-name.db /var/lib/rpm/Name upload guest-aux/fedora-packages.db /var/lib/rpm/Packages -upload bin-x86_64-dynamic /bin/ls +upload ${SRCDIR}/bin-x86_64-dynamic /bin/ls mkdir /boot/grub touch /boot/grub/grub.conf diff --git a/images/guest-aux/make-ubuntu-img.sh b/images/guest-aux/make-ubuntu-img.sh index 4ddb40ab..c48fd5d4 100755 --- a/images/guest-aux/make-ubuntu-img.sh +++ b/images/guest-aux/make-ubuntu-img.sh @@ -36,7 +36,7 @@ DISTRIB_DESCRIPTION="Ubuntu 10.10 (Phony Pharaoh)" EOF # Create a disk image. -../run ../fish/guestfish <<'EOF' +../run ../fish/guestfish <<EOF sparse ubuntu.img.tmp 512M run @@ -69,9 +69,9 @@ write /etc/debian_version "5.0.1" upload release.tmp /etc/lsb-release write /etc/hostname "ubuntu.invalid" -upload guest-aux/debian-packages /var/lib/dpkg/status +upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status -upload bin-i586-dynamic /bin/ls +upload ${SRCDIR}/bin-x86_64-dynamic /bin/ls mkdir /boot/grub touch /boot/grub/grub.conf diff --git a/images/guest-aux/make-windows-img.sh b/images/guest-aux/make-windows-img.sh index 3acb2b7f..9e2152da 100755 --- a/images/guest-aux/make-windows-img.sh +++ b/images/guest-aux/make-windows-img.sh @@ -36,7 +36,7 @@ if ! ../run ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; t fi # Create a disk image. -../run ../fish/guestfish <<'EOF' +../run ../fish/guestfish <<EOF sparse windows.img.tmp 512M run @@ -58,10 +58,10 @@ mkfs ntfs /dev/sda2 mount-options "" /dev/sda2 / mkdir-p /Windows/System32/Config -upload guest-aux/windows-software /Windows/System32/Config/SOFTWARE -upload guest-aux/windows-system /Windows/System32/Config/SYSTEM +upload ${SRCDIR}/guest-aux/windows-software /Windows/System32/Config/SOFTWARE +upload ${SRCDIR}/guest-aux/windows-system /Windows/System32/Config/SYSTEM -upload bin-win32.exe /Windows/System32/cmd.exe +upload ${SRCDIR}/bin-win32.exe /Windows/System32/cmd.exe mkdir "/Program Files" touch /autoexec.bat @@ -30,12 +30,11 @@ #---------------------------------------------------------------------- # Find this script. -run=$(readlink -f "$0") -b=$(dirname "$run") +b=@abs_builddir@ # Set TMPDIR so the appliance doesn't conflict with globally # installed libguestfs. -export TMPDIR=$b +export TMPDIR="$b" # Set local environment relative to this script. export LD_LIBRARY_PATH="$b/src/.libs" |