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.11.3~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=0da6f55a6745686ca056c6bc8ebf647f111cb8e8;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.
---

diff --git a/src/inspect_fs.c b/src/inspect_fs.c
index d258ec4..ff54634 100644
--- a/src/inspect_fs.c
+++ b/src/inspect_fs.c
@@ -223,9 +223,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;