From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 7 Dec 2011 11:46:43 +0000 (+0000)
Subject: fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ... 
X-Git-Tag: 1.14.7~6
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=82aec3fd43d3300bb8e60fe325486451defd5c45;p=libguestfs.git

fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ#760775).
(cherry picked from commit 7d3848ddc046f79cc1112809bd9970eea8060018)
---

diff --git a/fish/inspect.c b/fish/inspect.c
index 98329ee..7d4401e 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -86,14 +86,42 @@ 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);