diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-21 17:33:48 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-24 09:22:28 +0100 |
| commit | 54f12d3b0b4564c09b4bb9c45790ee97fd4c8e1d (patch) | |
| tree | 557468fc1bfa4f83403b4947895b2fc0b685019e | |
| parent | c9858f7fb77cedf4c607755dc80cc7f6c2cd78e6 (diff) | |
| download | libguestfs-54f12d3b0b4564c09b4bb9c45790ee97fd4c8e1d.tar.gz libguestfs-54f12d3b0b4564c09b4bb9c45790ee97fd4c8e1d.tar.xz libguestfs-54f12d3b0b4564c09b4bb9c45790ee97fd4c8e1d.zip | |
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 from commit 0da6f55a6745686ca056c6bc8ebf647f111cb8e8)
| -rw-r--r-- | src/inspect_fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inspect_fs.c b/src/inspect_fs.c index d258ec46..ff546340 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; |