X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2Fguest-aux%2Fmake-fedora-img.sh;h=3d6c471a24cf70b565ac66a2196dc0ec1eeb129e;hp=31989308faf0fcec687f2bc7b93591a65b4cd177;hb=70c033998e0e721dc4f9eb2a20348098b259752c;hpb=6d4815d3a4921219379bc9ec3cceead217668426

diff --git a/images/guest-aux/make-fedora-img.sh b/images/guest-aux/make-fedora-img.sh
index 3198930..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
 
@@ -48,12 +48,12 @@ lvcreate LV2 VG 32
 lvcreate LV3 VG 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.
-mkfs-b ext2 4096 /dev/VG/Root
+mkfs-opts ext2 /dev/VG/Root blocksize:4096
 set-e2label /dev/VG/Root ROOT
 set-e2uuid /dev/VG/Root 01234567-0123-0123-0123-012345678902
 
@@ -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"
@@ -92,9 +101,9 @@ mknod 0777 10 10 /bin/test7
 
 # Other filesystems.
 # Note that these should be empty, for testing virt-df.
-mkfs-b ext2 4096 /dev/VG/LV1
-mkfs-b ext2 1024 /dev/VG/LV2
-mkfs-b ext2 2048 /dev/VG/LV3
+mkfs-opts ext2 /dev/VG/LV1 blocksize:4096
+mkfs-opts ext2 /dev/VG/LV2 blocksize:1024
+mkfs-opts ext2 /dev/VG/LV3 blocksize:2048
 EOF
 
 rm fstab.tmp