From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 21 Apr 2011 16:33:48 +0000 (+0100)
Subject: inspect: Look for %systemroot%/system32 for Windows heuristic.
X-Git-Tag: 1.8.7~1
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=faa0c22cce27c418d1474ad745be5d00bb08ffd0;p=libguestfs.git

inspect: Look for %systemroot%/system32 for Windows heuristic.

The virt-v2v transfer ISO had a /windows directory.  The core
inspection code thought this was a Windows root filesystem.

Cherry picked and backported from
commit 0da6f55a6745686ca056c6bc8ebf647f111cb8e8.
---

diff --git a/src/inspect.c b/src/inspect.c
index 370220b..e7408b6 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -360,9 +360,9 @@ check_filesystem (guestfs_h *g, const char *device)
    * would *not* be Windows root disks.  (RHBZ#674130)
    */
   else if (is_file_nocase (g, "/AUTOEXEC.BAT") > 0 ||
-           is_dir_nocase (g, "/WINDOWS") > 0 ||
-           is_dir_nocase (g, "/WIN32") > 0 ||
-           is_dir_nocase (g, "/WINNT") > 0 ||
+           is_dir_nocase (g, "/WINDOWS/SYSTEM32") > 0 ||
+           is_dir_nocase (g, "/WIN32/SYSTEM32") > 0 ||
+           is_dir_nocase (g, "/WINNT/SYSTEM32") > 0 ||
            is_file_nocase (g, "/boot.ini") > 0 ||
            is_file_nocase (g, "/ntldr") > 0) {
     fs->is_root = 1;