X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Finspect_fs.c;h=3fa5c98eb6a055748320d2b46764e259c83a9b50;hb=3064277680ad11f887691646d0fa17bb35f38c19;hp=d258ec46cc17695a6cd4d53fa7109ec3f7ccd028;hpb=2b0ca7e7b8d369a42a51b1feec72ae8f17257c78;p=libguestfs.git

diff --git a/src/inspect_fs.c b/src/inspect_fs.c
index d258ec4..3fa5c98 100644
--- a/src/inspect_fs.c
+++ b/src/inspect_fs.c
@@ -29,9 +29,7 @@
 #include <errno.h>
 #include <endian.h>
 
-#ifdef HAVE_PCRE
 #include <pcre.h>
-#endif
 
 #ifdef HAVE_HIVEX
 #include <hivex.h>
@@ -46,7 +44,7 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
-#if defined(HAVE_PCRE) && defined(HAVE_HIVEX)
+#if defined(HAVE_HIVEX)
 
 /* Compile all the regular expressions once when the shared library is
  * loaded.  PCRE is thread safe so we're supposedly OK here if
@@ -223,9 +221,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;
@@ -538,4 +536,4 @@ guestfs___first_egrep_of_file (guestfs_h *g, const char *filename,
   return 1;
 }
 
-#endif /* defined(HAVE_PCRE) && defined(HAVE_HIVEX) */
+#endif /* defined(HAVE_HIVEX) */