out-of-tree build: generate ./run from template, fix image checks

[libguestfs.git] / images / guest-aux / make-debian-img.sh

diff --git a/images/guest-aux/make-debian-img.sh b/images/guest-aux/make-debian-img.sh
index 9a01e93..4b0490d 100755 (executable)
--- 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.
 EOF
 
 # Create a disk image.

-../run ../fish/guestfish <<'EOF'
+../run ../fish/guestfish <<EOF

 sparse debian.img.tmp 512M
 run
 
 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"
 
 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
 
 mkdir /boot/grub
 touch /boot/grub/grub.conf