diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-16 07:28:47 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-16 08:32:48 +0100 |
commit | 33a2c184e12c0bdbf061a9f36c87d76c28444712 (patch) | |
tree | 0069de7c4662ef6c064d48183fa7baf4350fd3c3 /images | |
parent | 5790f5bfafb12cc2ed9365461bf66e0fdfde7150 (diff) | |
download | libguestfs-33a2c184e12c0bdbf061a9f36c87d76c28444712.tar.gz libguestfs-33a2c184e12c0bdbf061a9f36c87d76c28444712.tar.xz libguestfs-33a2c184e12c0bdbf061a9f36c87d76c28444712.zip |
Remove local LIBGUESTFS_PATH detection from guestfish and guestmount.
Remove the hack that let you run ./fish/guestfish or
./fuse/guestmount. You now have to do:
./run ./fish/guestfish
or
./run ./fuse/guestmount
to run these programs without installing.
Diffstat (limited to 'images')
-rwxr-xr-x | images/guest-aux/make-debian-img.sh | 2 | ||||
-rwxr-xr-x | images/guest-aux/make-fedora-img.sh | 2 | ||||
-rwxr-xr-x | images/guest-aux/make-ubuntu-img.sh | 2 | ||||
-rwxr-xr-x | images/guest-aux/make-windows-img.sh | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/images/guest-aux/make-debian-img.sh b/images/guest-aux/make-debian-img.sh index 2170cecb..9a01e938 100755 --- 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. -../fish/guestfish <<'EOF' +../run ../fish/guestfish <<'EOF' sparse debian.img.tmp 512M run diff --git a/images/guest-aux/make-fedora-img.sh b/images/guest-aux/make-fedora-img.sh index 8f198f61..0e064b45 100755 --- a/images/guest-aux/make-fedora-img.sh +++ b/images/guest-aux/make-fedora-img.sh @@ -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 diff --git a/images/guest-aux/make-ubuntu-img.sh b/images/guest-aux/make-ubuntu-img.sh index f008c76f..4ddb40ab 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. -../fish/guestfish <<'EOF' +../run ../fish/guestfish <<'EOF' sparse ubuntu.img.tmp 512M run diff --git a/images/guest-aux/make-windows-img.sh b/images/guest-aux/make-windows-img.sh index f659f4b4..3acb2b7f 100755 --- a/images/guest-aux/make-windows-img.sh +++ b/images/guest-aux/make-windows-img.sh @@ -25,7 +25,7 @@ set -e # ntfs-3g/ntfsprogs then we cannot create a Windows phony image. # Nothing actually uses windows.img in the standard build so we can # just 'touch' it and emit a warning. -if ! ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then +if ! ../run ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then echo "***" echo "Warning: cannot create windows.img because there is no NTFS" echo "support in this build of libguestfs. Just touching the output" @@ -36,7 +36,7 @@ if ! ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then fi # Create a disk image. -../fish/guestfish <<'EOF' +../run ../fish/guestfish <<'EOF' sparse windows.img.tmp 512M run |