X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2Fguest-aux%2Fmake-fedora-img.sh;h=3d6c471a24cf70b565ac66a2196dc0ec1eeb129e;hb=663b99950daeaa2b023520aae756a3a28969c493;hp=8c38e5192c02d9bf9be35906023363aa5a908754;hpb=0710326ac5f1a06cf1dc3500617d04cf4cba5631;p=libguestfs.git

diff --git a/images/guest-aux/make-fedora-img.sh b/images/guest-aux/make-fedora-img.sh
index 8c38e51..3d6c471 100755
--- a/images/guest-aux/make-fedora-img.sh
+++ b/images/guest-aux/make-fedora-img.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs
-# Copyright (C) 2010 Red Hat Inc.
+# Copyright (C) 2010-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ LABEL=ROOT / ext2 default 0 0
 EOF
 
 # Create a disk image.
-../fish/guestfish <<'EOF'
+../run ../fish/guestfish <<EOF
 sparse fedora.img.tmp 512M
 run
 
@@ -73,8 +73,9 @@ write /etc/fedora-release "Fedora release 14 (Phony)"
 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
@@ -82,6 +83,14 @@ touch /boot/grub/grub.conf
 # Test files.
 write /etc/test1 "abcdefg"
 write /etc/test2 ""
+upload -<<__end /etc/test3
+a
+b
+c
+d
+e
+f
+__end
 write /bin/test1 "abcdefg"
 write /bin/test2 "zxcvbnm"
 write /bin/test3 "1234567"