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-05-18 11:44:58 +0100 |
| commit | faa0c22cce27c418d1474ad745be5d00bb08ffd0 (patch) | |
| tree | 55b8093680f9f313908aa9587e8004b888ce9216 /src/inspect.c | |
| parent | df4dce74a887e013a6aec51e241a90cfb7d3b36a (diff) | |
| download | libguestfs-faa0c22cce27c418d1474ad745be5d00bb08ffd0.tar.gz libguestfs-faa0c22cce27c418d1474ad745be5d00bb08ffd0.tar.xz libguestfs-faa0c22cce27c418d1474ad745be5d00bb08ffd0.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 and backported from
commit 0da6f55a6745686ca056c6bc8ebf647f111cb8e8.
Diffstat (limited to 'src/inspect.c')
| -rw-r--r-- | src/inspect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inspect.c b/src/inspect.c index 370220b5..e7408b69 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; |