X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-edit;h=a0042917c15874df50cb875323cc97ecd0b04caa;hp=59b5b2b91bb5759c3d15155a9e10e82bd950cac0;hb=5ce759bfdc70c97121ef34ab4d5c918d568f2474;hpb=a80177cc847102d5a6e43a8ff87769e86f30bd6c

diff --git a/tools/virt-edit b/tools/virt-edit
index 59b5b2b..a004291 100755
--- a/tools/virt-edit
+++ b/tools/virt-edit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # virt-edit
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-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
@@ -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
@@ -53,8 +52,13 @@ you from doing this, but doesn't catch all cases.
 C<virt-edit> is a command line tool to edit C<file> where C<file>
 exists in the named virtual machine (or disk image).
 
-If you want to just view a file, use L<virt-cat(1)>.  For more complex
-cases you should look at the L<guestfish(1)> tool.
+If you want to just view a file, use L<virt-cat(1)>.
+
+For more complex cases you should look at the L<guestfish(1)> tool
+(see L</USING GUESTFISH> below).
+
+C<virt-edit> cannot be used to create a new file, nor to edit
+multiple files.  L<guestfish(1)> can do that and much more.
 
 =head1 EXAMPLES
 
@@ -64,6 +68,10 @@ Edit the named files interactively:
 
  virt-edit mydomain /etc/passwd
 
+For Windows guests, some Windows paths are understood:
+
+ virt-edit mywindomain 'c:\autoexec.bat'
+
 You can also edit files non-interactively (see
 L</NON-INTERACTIVE EDITING> below).
 To change the init default level to 5:
@@ -120,6 +128,23 @@ at all.
 
 =cut
 
+my $format;
+
+=item B<--format> raw
+
+Specify the format of disk images given on the command line.  If this
+is omitted then the format is autodetected from the content of the
+disk image.
+
+If disk images are requested from libvirt, then this program asks
+libvirt for this information.  In this case, the value of the format
+parameter is ignored.
+
+If working with untrusted raw-format guest disk images, you should
+ensure the format is always specified.
+
+=cut
+
 my $expr;
 
 =item B<--expr EXPR> | B<-e EXPR>
@@ -138,6 +163,7 @@ being altered by the shell.
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
+            "format=s" => \$format,
             "expr|e=s" => \$expr,
             "backup|b=s" => \$backup,
     ) or pod2usage (2);
@@ -156,34 +182,40 @@ my $filename = pop @ARGV;
 
 my $g;
 if ($uri) {
-    $g = open_guest (\@ARGV, address => $uri, rw => 1);
+    $g = open_guest (\@ARGV, address => $uri, rw => 1, format => $format);
 } else {
-    $g = open_guest (\@ARGV, rw => 1);
+    $g = open_guest (\@ARGV, rw => 1, format => $format);
 }
 
 $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 @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 $root = $roots[0];
+my %fses = $g->inspect_get_mountpoints ($root);
+my @fses = sort { length $a <=> length $b } keys %fses;
+foreach (@fses) {
+    $g->mount_options ("", $fses{$_}, $_);
+}
 
-my $os = $oses->{$root_dev};
-mount_operating_system ($g, $os, 0);
+# Special handling for Windows filenames.
+$filename = windows_path ($g, $root, $filename)
+    if $g->inspect_get_type ($root) eq "windows";
 
-my ($fh_not_used, $tempname) = tempfile (UNLINK => 1);
+my ($fh, $tempname) = tempfile (UNLINK => 1);
+my $fddev = "/dev/fd/" . fileno ($fh);
 
 # Allow this to fail in case eg. the file does not exist.
-$g->download($filename, $tempname);
+$g->download ($filename, $fddev);
+
+close $fh or die "close: $!";
 
 my $do_upload = $tempname;
 
@@ -214,7 +246,7 @@ if (!defined $expr) {
         die if $@;
         print $fh $_ or die "print: $!";
     }
-    close $fh;
+    close $fh or die "close: $!";
 
     $do_upload = $tempout;
 }
@@ -245,8 +277,6 @@ if (defined $do_upload) {
 
 undef $g;
 
-exit 0;
-
 =head1 NON-INTERACTIVE EDITING
 
 C<virt-edit> normally calls out to C<$EDITOR> (or vi) so
@@ -262,7 +292,7 @@ The first method is to temporarily set C<$EDITOR> to any script or
 program you want to run.  The script is invoked as C<$EDITOR tmpfile>
 and it should update C<tmpfile> in place however it likes.
 
-The second method is to use the C<-e> parameter of C<virt-edit> to run
+The second method is to use the I<-e> parameter of C<virt-edit> to run
 a short Perl snippet in the style of L<sed(1)>.  For example to
 replace all instances of C<foo> with C<bar> in a file:
 
@@ -309,6 +339,140 @@ file):
 
  my $m = $_; chomp $m; $m =~ /some text$/
 
+=head1 WINDOWS PATHS
+
+C<virt-edit> has a limited ability to understand Windows drive letters
+and paths (eg. C<E:\foo\bar.txt>).
+
+If and only if the guest is running Windows then:
+
+=over 4
+
+=item *
+
+Drive letter prefixes like C<C:> are resolved against the
+Windows Registry to the correct filesystem.
+
+=item *
+
+Any backslash (C<\>) characters in the path are replaced
+with forward slashes so that libguestfs can process it.
+
+=item *
+
+The path is resolved case insensitively to locate the file
+that should be edited.
+
+=back
+
+There are some known shortcomings:
+
+=over 4
+
+=item *
+
+Some NTFS symbolic links may not be followed correctly.
+
+=item *
+
+NTFS junction points that cross filesystems are not followed.
+
+=back
+
+=cut
+
+sub windows_path
+{
+    my $g = shift;
+    my $root = shift;
+    my $filename = shift;
+
+    # Deal with drive letters.
+    if ($filename =~ /^([a-z]):(.*)/i) {
+        $filename = $2;
+        my $drive_letter = $1;
+
+        # Look up the drive letter in the drive mapping table.  We
+        # have to do a case insensitive comparison, the slow way.
+        my $device;
+        my %drives = $g->inspect_get_drive_mappings ($root);
+        foreach (keys %drives) {
+            if (lc $_ eq lc $drive_letter) {
+                $device = $drives{$_};
+                last;
+            }
+        }
+
+        die __x("virt-edit: drive '{x}:' not found\n", x => $drive_letter)
+            unless defined $device;
+
+        # Unmount current disk and remount $device.
+        $g->umount_all ();
+        $g->mount_options ("", $device, "/");
+    }
+
+    # Replace any backslashes in the rest of the path with
+    # forward slashes.
+    $filename =~ s{\\}{/}g;
+
+    # If the user put \foo on the command line without quoting it
+    # properly, then we'll see that here as a bare path.  Add a more
+    # descriptive error message here.
+    if (substr ($filename, 0, 1) ne "/") {
+        die __x("virt-edit: '{f}' does not start with a / or \\ character.
+If you are using Windows style paths with backslashes like C:\\foo.txt
+then don't forget that you must quote them with single quotes to
+prevent the shell from munging the backslashes.\n",
+                f => $filename)
+    }
+
+    # Case sensitivity.
+    $filename = $g->case_sensitive_path ($filename);
+
+    return $filename;
+}
+
+=head1 USING GUESTFISH
+
+L<guestfish(1)> is a more powerful, lower level tool which you can use
+when C<virt-edit> doesn't work.
+
+Using C<virt-edit> is approximately equivalent to doing:
+
+ guestfish --rw -i -d domname edit /file
+
+where C<domname> is the name of the libvirt guest, and C</file> is the
+full path to the file.
+
+The command above uses libguestfs's guest inspection feature and so
+does not work on guests that libguestfs cannot inspect, or on things
+like arbitrary disk images that don't contain guests.  To edit a file
+on a disk image directly, use:
+
+ guestfish --rw -a disk.img -m /dev/sda1 edit /file
+
+where C<disk.img> is the disk image, C</dev/sda1> is the filesystem
+within the disk image to edit, and C</file> is the full path to the
+file.
+
+C<virt-edit> cannot create new files.  Use the guestfish commands
+C<touch>, C<write> or C<upload> instead:
+
+ guestfish --rw -i -d domname touch /newfile
+
+ guestfish --rw -i -d domname write /newfile "new content"
+
+ guestfish --rw -i -d domname upload localfile /newfile
+
+C<virt-edit> cannot edit multiple files, but guestfish can
+do it like this:
+
+ guestfish --rw -i -d domname edit /file1 : edit /file2
+
+=cut
+
+exit 0;
+
 =head1 ENVIRONMENT VARIABLES
 
 =over 4
@@ -334,6 +498,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)>,
@@ -347,7 +513,7 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 
 =head1 COPYRIGHT
 
-Copyright (C) 2009-2010 Red Hat Inc.
+Copyright (C) 2009-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