From 66eb6b8c3a5b851035d5f24fb60e7045e15a4b4d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 10 Jan 2011 16:07:12 +0000
Subject: [PATCH] RHEL 7: Emphasize libguestfs-winsupport package
 (RHBZ#627468).

This RHEL-only patch changes the error messages when the
inspection code cannot find an operating system inside the guest
image.  For a Windows guest this may happen because the user has not
installed the separate 'libguestfs-winsupport' package.  Therefore we
emphasize that the user may need to install this package.

Notes:

(1) In RHEL there are two pieces of inspection code, the old Perl code
(deprecated upstream) and the new C core inspection API.  Therefore
this patch has to touch two places with essentially the same change.

(2) This patch doesn't try to be clever and detect if it was a Windows
guest.  This should reduce the chance of failure.

Output from (Perl) virt-inspector now looks like this:

 $ virt-inspector disk.img
 No operating system could be detected inside this disk image.

 This may be because the file is not a disk image, or is not a virtual machine
 image, or because the OS type is not understood by virt-inspector.

 If you feel this is an error, please file a bug report including as much
 information about the disk image as possible.

 RHEL notice
 -------------
 libguestfs will return this error for Microsoft Windows guests if the
 separate 'libguestfs-winsupport' package is not installed. If the
 guest is running Microsoft Windows, please try again after installing
 'libguestfs-winsupport'.

Output from guestfish (ie. C core inspection API) now looks like this:

 $ guestfish -i disk.img
 guestfish: no operating system was found on this disk

 RHEL notice
 -------------
 libguestfs will return this error for Microsoft Windows guests if the
 separate 'libguestfs-winsupport' package is not installed. If the
 guest is running Microsoft Windows, please try again after installing
 'libguestfs-winsupport'.
---
 fish/inspect.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/fish/inspect.c b/fish/inspect.c
index 801d867..8858fcd 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 #include <libintl.h>
 
 #include "c-ctype.h"
@@ -68,6 +69,10 @@ inspect_mount (void)
     exit (EXIT_FAILURE);
 
   if (roots[0] == NULL) {
+    int libguestfs_winsupport_installed =
+      access ("/usr/lib/guestfs/supermin.d/ntfs.img", F_OK) == 0 ||
+      access ("/usr/lib64/guestfs/supermin.d/ntfs.img", F_OK) == 0;
+
     fprintf (stderr,
       _("%s: no operating system was found on this disk\n"
         "\n"
@@ -84,6 +89,15 @@ inspect_mount (void)
         "with these tools.  Use the guestfish equivalent commands\n"
         "(see the virt tool manual page).\n"),
              program_name);
+    if (!libguestfs_winsupport_installed)
+      fprintf (stderr,
+    _("\nRHEL notice\n"
+      "-------------\n"
+      "libguestfs will return this error for Microsoft Windows guests if the\n"
+      "separate 'libguestfs-winsupport' package is not installed. If the\n"
+      "guest is running Microsoft Windows, please try again after installing\n"
+      "'libguestfs-winsupport'.\n"));
+
     guestfs___free_string_list (roots);
     exit (EXIT_FAILURE);
   }
-- 
1.8.3.1