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-18 22:11:54 +0100 |
| commit | 9ba4136a6560be713931f70245c50f3968d2af15 (patch) | |
| tree | d348a5ce8f2d29e3cc29ae106cb79c5eaa7b27ce /fuse | |
| parent | d642bef76613be44be733bbfcdb560d86c8ef8b5 (diff) | |
| download | libguestfs-9ba4136a6560be713931f70245c50f3968d2af15.tar.gz libguestfs-9ba4136a6560be713931f70245c50f3968d2af15.tar.xz libguestfs-9ba4136a6560be713931f70245c50f3968d2af15.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.
(cherry picked from commit 33a2c184e12c0bdbf061a9f36c87d76c28444712)
Diffstat (limited to 'fuse')
| -rw-r--r-- | fuse/guestmount.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fuse/guestmount.c b/fuse/guestmount.c index 8d483b33..1e3b5dbe 100644 --- a/fuse/guestmount.c +++ b/fuse/guestmount.c @@ -1034,19 +1034,6 @@ main (int argc, char *argv[]) */ ADD_FUSE_ARG ("-s"); - /* If developing, add ./appliance to the path. Note that libtools - * interferes with this because uninstalled guestfish is a shell - * script that runs the real program with an absolute path. Detect - * that too. - * - * BUT if LIBGUESTFS_PATH environment variable is already set by - * the user, then don't override it. - */ - if (getenv ("LIBGUESTFS_PATH") == NULL && - argv[0] && - (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL)) - guestfs_set_path (g, "appliance:" GUESTFS_DEFAULT_PATH); - for (;;) { c = getopt_long (argc, argv, options, long_options, &option_index); if (c == -1) break; |