X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Finspect.c;h=f93367b309ebf84854127b3afc9f6507d17263ae;hp=5e1948cd143bffeb0bea8c20c6403a6a635dd463;hb=HEAD;hpb=a20e5c00c35490fa29668630113a01240a69b701

diff --git a/fish/inspect.c b/fish/inspect.c
index 5e1948c..f93367b 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -43,14 +43,14 @@ free_strings (char **argv)
   free (argv);
 }
 
-static int
+static size_t
 count_strings (char *const *argv)
 {
-  int c;
+  size_t i;
 
-  for (c = 0; argv[c]; ++c)
+  for (i = 0; argv[i]; ++i)
     ;
-  return c;
+  return i;
 }
 
 static int
@@ -86,14 +86,44 @@ inspect_mount (void)
     exit (EXIT_FAILURE);
 
   if (roots[0] == NULL) {
-    fprintf (stderr, _("%s: no operating system was found on this disk\n"),
+    fprintf (stderr,
+      _("%s: no operating system was found on this disk\n"
+        "\n"
+        "If using guestfish '-i' option, remove this option and instead\n"
+        "use the commands 'run' followed by 'list-filesystems'.\n"
+        "You can then mount filesystems you want by hand using the\n"
+        "'mount' or 'mount-ro' command.\n"
+        "\n"
+        "If using guestmount '-i', remove this option and choose the\n"
+        "filesystem(s) you want to see by manually adding '-m' option(s).\n"
+        "Use 'virt-filesystems' to see what filesystems are available.\n"
+        "\n"
+        "If using other virt tools, this disk image won't work\n"
+        "with these tools.  Use the guestfish equivalent commands\n"
+        "(see the virt tool manual page).\n"),
              program_name);
+    free_strings (roots);
     exit (EXIT_FAILURE);
   }
 
   if (roots[1] != NULL) {
-    fprintf (stderr, _("%s: multi-boot operating systems are not supported by the -i option\n"),
+    fprintf (stderr,
+      _("%s: multi-boot operating systems are not supported\n"
+        "\n"
+        "If using guestfish '-i' option, remove this option and instead\n"
+        "use the commands 'run' followed by 'list-filesystems'.\n"
+        "You can then mount filesystems you want by hand using the\n"
+        "'mount' or 'mount-ro' command.\n"
+        "\n"
+        "If using guestmount '-i', remove this option and choose the\n"
+        "filesystem(s) you want to see by manually adding '-m' option(s).\n"
+        "Use 'virt-filesystems' to see what filesystems are available.\n"
+        "\n"
+        "If using other virt tools, multi-boot operating systems won't work\n"
+        "with these tools.  Use the guestfish equivalent commands\n"
+        "(see the virt tool manual page).\n"),
              program_name);
+    free_strings (roots);
     exit (EXIT_FAILURE);
   }
 
@@ -124,8 +154,14 @@ inspect_mount_root (const char *root)
       r = guestfs_mount_options (g, "", mountpoints[i+1], mountpoints[i]);
     else
       r = guestfs_mount_ro (g, mountpoints[i+1], mountpoints[i]);
-    if (r == -1)
+    if (r == -1) {
+      /* If the "/" filesystem could not be mounted, give up, else
+       * just count the errors and print a warning.
+       */
+      if (STREQ (mountpoints[i], "/"))
+        exit (EXIT_FAILURE);
       mount_errors++;
+    }
   }
 
   free_strings (mountpoints);
@@ -142,7 +178,7 @@ void
 print_inspect_prompt (void)
 {
   char *name = guestfs_inspect_get_product_name (g, root);
-  if (STRNEQ (name, "unknown"))
+  if (name && STRNEQ (name, "unknown"))
     printf (_("Operating system: %s\n"), name);
   free (name);