X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-edit;h=c8ee1594ab565046d3bf087f02c200f49c83f454;hp=78316fd0a13fbc5072a15d2618bee0839163c4de;hb=dc8e4b057ecd3984d7c27c8e;hpb=2f52a40bed27e49972b957f1ef3276c422d5ef96

diff --git a/tools/virt-edit b/tools/virt-edit
index 78316fd..c8ee159 100755
--- a/tools/virt-edit
+++ b/tools/virt-edit
@@ -20,12 +20,11 @@ use warnings;
 use strict;
 
 use Sys::Guestfs;
-use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
-  inspect_all_partitions inspect_partition
-  inspect_operating_systems mount_operating_system);
+use Sys::Guestfs::Lib qw(open_guest);
 use Pod::Usage;
 use Getopt::Long;
 use File::Temp qw/tempfile/;
+use File::Basename;
 use Locale::TextDomain 'libguestfs';
 
 =encoding utf8
@@ -181,22 +180,20 @@ if ($uri) {
 
 $g->launch ();
 
-# List of possible filesystems.
-my @partitions = get_partitions ($g);
-
-# Now query each one to build up a picture of what's in it.
-my %fses =
-    inspect_all_partitions ($g, \@partitions,
-      use_windows_registry => 0);
-
-my $oses = inspect_operating_systems ($g, \%fses);
-
-my @roots = keys %$oses;
-die __"multiboot operating systems are not supported by virt-edit" if @roots > 1;
-my $root_dev = $roots[0];
-
-my $os = $oses->{$root_dev};
-mount_operating_system ($g, $os, 0);
+my @roots = $g->inspect_os ();
+if (@roots == 0) {
+    die __x("{prog}: No operating system could be detected inside this disk image.\n\nThis may be because the file is not a disk image, or is not a virtual machine\nimage, or because the OS type is not understood by libguestfs.\n\nIf you feel this is an error, please file a bug report including as much\ninformation about the disk image as possible.\n",
+            prog => basename ($0));
+}
+if (@roots > 1) {
+    die __x("{prog}: multiboot operating systems are not supported.\n",
+            prog => basename ($0))
+}
+my %fses = $g->inspect_get_mountpoints ($roots[0]);
+my @fses = sort { length $a <=> length $b } keys %fses;
+foreach (@fses) {
+    $g->mount_options ("", $fses{$_}, $_);
+}
 
 my ($fh, $tempname) = tempfile (UNLINK => 1);
 my $fddev = "/dev/fd/" . fileno ($fh);
@@ -355,6 +352,8 @@ manual page L<sh(1)> for details.
 L<guestfs(3)>,
 L<guestfish(1)>,
 L<virt-cat(1)>,
+L<virt-copy-in(1)>,
+L<virt-tar-in(1)>,
 L<Sys::Guestfs(3)>,
 L<Sys::Guestfs::Lib(3)>,
 L<Sys::Virt(3)>,