search for: boot_ini_path

...ion(+), 1 deletion(-) diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index 4eea6a3..c67f164 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -154,7 +154,7 @@ guestfs___get_windows_systemroot (guestfs_h *g) * systemroot locations */ CLEANUP_FREE char *boot_ini_path = guestfs___case_sensitive_path_silently (g, "/boot.ini"); - if (boot_ini_path) { + if (boot_ini_path && guestfs_is_file (g, boot_ini_path)) { CLEANUP_FREE_STRING_LIST char **boot_ini = guestfs_read_lines (g, boot_ini_path); if (!boot_ini) { -- 1.8.2.1

...let rec loop = function diff --git a/daemon/inspect_fs_windows.ml b/daemon/inspect_fs_windows.ml index 78af7f048..c7b766dd0 100644 --- a/daemon/inspect_fs_windows.ml +++ b/daemon/inspect_fs_windows.ml @@ -84,7 +84,7 @@ and get_windows_systemroot () = and get_windows_systemroot_from_boot_ini boot_ini_path = let chroot = Chroot.create ~name:"get_windows_systemroot_from_boot_ini" () in - let lines = Chroot.f chroot (fun () -> read_small_file boot_ini_path) () in + let lines = Chroot.f chroot read_small_file boot_ini_path in match lines with | None -> None | Some lines -&g...

...pcre_free (re_boot_ini_os); } static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); @@ -143,6 +149,86 @@ guestfs___get_windows_systemroot (guestfs_h *g) } } + /* If the fs contains boot.ini, check it for non-standard + * systemroot locations */ + CLEANUP_FREE char *boot_ini_path = + guestfs___case_sensitive_path_silently (g, "/boot.ini"); + if (boot_ini_path) { + CLEANUP_FREE_STRING_LIST char **boot_ini = + guestfs_read_lines (g, boot_ini_path); + if (!boot_ini) { + debug (g, "error reading %s", boot_ini_path); + return NULL; +...

...se loop paths + in + let systemroot = loop systemroot_paths in + + let systemroot = + match systemroot with + | Some systemroot -> Some systemroot + | None -> + (* If the fs contains boot.ini, check it for non-standard + * systemroot locations. + *) + let boot_ini_path = case_sensitive_path_silently "/boot.ini" in + match boot_ini_path with + | None -> None + | Some boot_ini_path -> + get_windows_systemroot_from_boot_ini boot_ini_path in + + match systemroot with + | None -> None + | Some systemroot -> + if...

This change refactors guestfs___has_windows_systemroot to guestfs___get_windows_systemroot. The new function returns a dynamically allocated char * which must be freed. The new function is no less efficient than before, as it returns the result of guestfs___case_sensitive_path_silently, which is required anyway. The new code is slightly more efficient than before, as it re-uses the result of this

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...