search for: 0473e92

Check for filesystem.squashfs also in /live, since it is where live-build places it. --- src/inspect-fs-cd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index 407e4f8..eaeaa6f 100644 --- a/src/inspect-fs-cd.c +++ b/src/inspect-fs-cd.c @@ -429,7 +429,8 @@ guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs) *

...should just inline this function, makes the code simpler. > /* Windows 2003 64 bit */ > else if (guestfs_is_file (g, "/amd64/txtsetup.sif") > 0) { > fs->arch = safe_strdup (g, "x86_64"); > diff --git a/src/inspect-fs.c b/src/inspect-fs.c > index 0473e92..89c9335 100644 > --- a/src/inspect-fs.c > +++ b/src/inspect-fs.c > @@ -320,7 +320,8 @@ check_filesystem (guestfs_h *g, const char *mountable, > guestfs_is_file (g, "/.discinfo") > 0 || > guestfs_is_file (g, "/i386/txtsetup.sif") >...

...; 0) { + if (check_freebsd_installer_root (g, fs) == -1) + return -1; + } + /* Windows 2003 64 bit */ else if (guestfs_is_file (g, "/amd64/txtsetup.sif") > 0) { fs->arch = safe_strdup (g, "x86_64"); diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 0473e92..89c9335 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -320,7 +320,8 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_file (g, "/.discinfo") > 0 || guestfs_is_file (g, "/i386/txtsetup.sif") > 0 || guestfs...

...g, "/boot/loader.rc") > 0) { + fs->type = OS_TYPE_FREEBSD; + } + /* Windows 2003 64 bit */ else if (guestfs_is_file (g, "/amd64/txtsetup.sif") > 0) { fs->arch = safe_strdup (g, "x86_64"); diff --git a/src/inspect-fs.c b/src/inspect-fs.c index 0473e92..89c9335 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -320,7 +320,8 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_file (g, "/.discinfo") > 0 || guestfs_is_file (g, "/i386/txtsetup.sif") > 0 || guestfs...

...k above in has_windows_systemroot. */ + /* Should exist because of previous check above in get_windows_systemroot. */ CLEANUP_FREE char *cmd_exe_path = guestfs_case_sensitive_path (g, cmd_exe); if (!cmd_exe_path) return -1; diff --git a/src/inspect-fs.c b/src/inspect-fs.c index d220634..0473e92 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -175,6 +175,9 @@ check_filesystem (guestfs_h *g, const char *mountable, const struct guestfs_internal_mountable *m, int whole_device) { + /* Not CLEANUP_FREE, as it will be cleaned up with inspection inf...