From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 22 Mar 2011 11:20:38 +0000 (+0000)
Subject: inspect: Don't fail for Windows guests with multiple disks (RHBZ#674130).
X-Git-Tag: 1.9.13~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d06fee159c14d4fe7654a02bae8849c4f82565f8;p=libguestfs.git

inspect: Don't fail for Windows guests with multiple disks (RHBZ#674130).
---

diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
index ccc5bb5..d0dcf23 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -173,6 +173,8 @@ enum inspect_fs_content {
   FS_CONTENT_UNKNOWN = 0,
   FS_CONTENT_LINUX_ROOT,
   FS_CONTENT_WINDOWS_ROOT,
+  FS_CONTENT_WINDOWS_VOLUME_WITH_APPS,
+  FS_CONTENT_WINDOWS_VOLUME,
   FS_CONTENT_LINUX_BOOT,
   FS_CONTENT_LINUX_USR,
   FS_CONTENT_LINUX_USR_LOCAL,
diff --git a/src/inspect.c b/src/inspect.c
index 20e8806..1129a53 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -366,9 +366,13 @@ check_filesystem (guestfs_h *g, const char *device,
            guestfs_is_dir (g, "/run") > 0 &&
            guestfs_is_dir (g, "/spool") > 0)
     fs->content = FS_CONTENT_LINUX_VAR;
-  /* Windows root? */
+  /* Windows root?
+   * Note that if a Windows guest has multiple disks and applications
+   * are installed on those other disks, then those other disks will
+   * contain "/Program Files" and "/System Volume Information".  Those
+   * would *not* be Windows root disks.  (RHBZ#674130)
+   */
   else if (is_file_nocase (g, "/AUTOEXEC.BAT") > 0 ||
-           is_dir_nocase (g, "/Program Files") > 0 ||
            is_dir_nocase (g, "/WINDOWS") > 0 ||
            is_dir_nocase (g, "/WIN32") > 0 ||
            is_dir_nocase (g, "/WINNT") > 0 ||
@@ -380,6 +384,13 @@ check_filesystem (guestfs_h *g, const char *device,
     if (check_windows_root (g, fs) == -1)
       return -1;
   }
+  /* Windows volume with installed applications (but not root)? */
+  else if (is_dir_nocase (g, "/System Volume Information") > 0 &&
+           is_dir_nocase (g, "/Program Files") > 0)
+    fs->content = FS_CONTENT_WINDOWS_VOLUME_WITH_APPS;
+  /* Windows volume (but not root)? */
+  else if (is_dir_nocase (g, "/System Volume Information") > 0)
+    fs->content = FS_CONTENT_WINDOWS_VOLUME;
   /* Install CD/disk?  Skip these checks if it's not a whole device
    * (eg. CD) or the first partition (eg. bootable USB key).
    */