search for: guestfs___check_installer_root

...installer_root (guestfs_h *g, struct inspect_fs *fs) > +{ > + fs->type = OS_TYPE_FREEBSD; > + > + return 0; > +} > + > /* Windows 2003 and similar versions. > * > * NB: txtsetup file contains Windows \r\n line endings, which guestfs_grep > @@ -430,7 +440,8 @@ guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs) > * need to unpack this and look inside to tell the difference. > */ > if (guestfs_is_file (g, "/casper/filesystem.squashfs") > 0 || > - guestfs_is_file (g, "/live/filesystem.squashfs") > 0) > + gues...

...ashfs 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) * Fedora live CDs which contain the same, but larger file). We * need to unpack this and look inside to tell the difference. */ - if (guestfs_is_file (g, "/casper/filesystem.squashfs") > 0) + if (guestfs_is_file (g, "/casper/fil...

.../boot/loader.rc. + */ +static int +check_freebsd_installer_root (guestfs_h *g, struct inspect_fs *fs) +{ + fs->type = OS_TYPE_FREEBSD; + + return 0; +} + /* Windows 2003 and similar versions. * * NB: txtsetup file contains Windows \r\n line endings, which guestfs_grep @@ -430,7 +440,8 @@ guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs) * need to unpack this and look inside to tell the difference. */ if (guestfs_is_file (g, "/casper/filesystem.squashfs") > 0 || - guestfs_is_file (g, "/live/filesystem.squashfs") > 0) + guestfs_is_file (g, "/li...

...See also RHBZ#1033207. --- src/inspect-fs-cd.c | 8 +++++++- src/inspect-fs.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index eaeaa6f..45d7bb5 100644 --- a/src/inspect-fs-cd.c +++ b/src/inspect-fs-cd.c @@ -430,7 +430,8 @@ guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs) * need to unpack this and look inside to tell the difference. */ if (guestfs_is_file (g, "/casper/filesystem.squashfs") > 0 || - guestfs_is_file (g, "/live/filesystem.squashfs") > 0) + guestfs_is_file (g, "/li...

...estfs_h *g); -extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs); +extern char * guestfs___get_windows_systemroot (guestfs_h *g); +extern int guestfs___check_windows_root (guestfs_h *g, struct inspect_fs *fs, char *windows_systemroot); /* inspect-fs-cd.c */ extern int guestfs___check_installer_root (guestfs_h *g, struct inspect_fs *fs); diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index a979775..8ddea95 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -101,60 +101,58 @@ static char *map_registry_disk_blob (guestfs_h *g, const void *blob); * "/...

This adds most of the hivex APIs directly to the libguestfs API, so that you can read and write Windows Registry hive files from libguestfs without needing to download and upload hive files from the guest. This is analogous to how Augeas APIs are exposed already (guestfs_aug_*) Also, inspection is now done using the new APIs, which fixes the following bug:

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.