Lib: Document the $ro parameter for mount_operating_system properly.

[libguestfs.git] / perl / lib / Sys / Guestfs / Lib.pm

diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
index 5d48ba8..bc8be9d 100644 (file)
--- a/perl/lib/Sys/Guestfs/Lib.pm
+++ b/perl/lib/Sys/Guestfs/Lib.pm
@@ -1049,13 +1049,14 @@ sub _find_filesystem
 
 =head2 mount_operating_system
 
- mount_operating_system ($g, \%os);
+ mount_operating_system ($g, \%os, [$ro]);
 
 This function mounts the operating system described in the
 C<%os> hash according to the C<mounts> table in that hash (see
 C<inspect_operating_systems>).
 
-The partitions are mounted read-only.
+The partitions are mounted read-only unless the third parameter
+is specified as zero explicitly.
 
 To reverse the effect of this call, use the standard
 libguestfs API call C<$g-E<gt>umount_all ()>.
@@ -1067,14 +1068,22 @@ sub mount_operating_system
     local $_;
     my $g = shift;
     my $os = shift;
+    my $ro = shift;            # Read-only?
+
+    $ro = 1 unless defined $ro; # ro defaults to 1 if unspecified
 
     my $mounts = $os->{mounts};
 
     # Have to mount / first.  Luckily '/' is early in the ASCII
     # character set, so this should be OK.
     foreach (sort keys %$mounts) {
-       $g->mount_ro ($mounts->{$_}, $_)
-           if $_ ne "swap" && $_ ne "none" && ($_ eq '/' || $g->is_dir ($_));
+        if($_ ne "swap" && $_ ne "none" && ($_ eq '/' || $g->is_dir ($_))) {
+            if($ro) {
+                $g->mount_ro ($mounts->{$_}, $_)
+            } else {
+                $g->mount ($mounts->{$_}, $_)
+            }
+        }
     }
 }
 
@@ -1299,10 +1308,10 @@ sub _check_for_initrd
            my $version = $1;
            my @modules;
 
-           # Disregard old-style compressed ext2 files, since cpio
-           # takes ages to (fail to) process these.
-           if ($g->file ("/boot/$initrd") !~ /gzip compressed/ ||
-               $g->zfile ("gzip", "/boot/$initrd") !~ /ext2 filesystem/) {
+           # Disregard old-style compressed ext2 files and only
+           # work with real compressed cpio files, since cpio
+           # takes ages to (fail to) process anything else.
+           if ($g->file ("/boot/$initrd") =~ /cpio/) {
                eval {
                    @modules = $g->initrd_list ("/boot/$initrd");
                };