diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2011-08-18 00:14:46 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-08-18 09:55:52 +0100 |
| commit | 70c033998e0e721dc4f9eb2a20348098b259752c (patch) | |
| tree | 20e011a5ced71021e90db0a8de5f72f827eaad64 /images/guest-aux/make-ubuntu-img.sh | |
| parent | 5d296dfd609fb1aa865109b1040a4d5bf2981e60 (diff) | |
| download | libguestfs-70c033998e0e721dc4f9eb2a20348098b259752c.tar.gz libguestfs-70c033998e0e721dc4f9eb2a20348098b259752c.tar.xz libguestfs-70c033998e0e721dc4f9eb2a20348098b259752c.zip | |
out-of-tree build: generate ./run from template, fix image checks
./run can now be run in a separate build directory. Since some files
needed in the image checks are found in the source tree (but not the
build tree), the source tree location is passed to make-*-img.sh via
an environment variable.
Diffstat (limited to 'images/guest-aux/make-ubuntu-img.sh')
| -rwxr-xr-x | images/guest-aux/make-ubuntu-img.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |