EOF
# Create a disk image.
-../fish/guestfish <<'EOF'
+../run ../fish/guestfish <<EOF
sparse ubuntu.img.tmp 512M
run
part-add /dev/sda p 524288 -64
# Phony /boot filesystem.
-mkfs-b ext2 4096 /dev/sda1
+mkfs-opts ext2 /dev/sda1 blocksize:4096
set-e2label /dev/sda1 BOOT
set-e2uuid /dev/sda1 01234567-0123-0123-0123-012345678901
# Phony root filesystem (Ubuntu doesn't use LVM by default).
-mkfs-b ext2 4096 /dev/sda2
+mkfs-opts ext2 /dev/sda2 blocksize:4096
set-e2uuid /dev/sda2 01234567-0123-0123-0123-012345678902
# Enough to fool inspection API.
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