search for: im_device

...p with inspection info */ char *windows_systemroot = NULL; if (extend_fses (g) == -1) return -1; - int partnum = -1; - if (!whole_device && m->im_type == MOUNTABLE_DEVICE) { - guestfs_push_error_handler (g, NULL, NULL); - partnum = guestfs_part_to_partnum (g, m->im_device); - guestfs_pop_error_handler (g); + if (!whole_device && m->im_type == MOUNTABLE_DEVICE && + guestfs___is_partition (g, m->im_device)) { + if (get_partition_context (g, m->im_device, + &partnum, &nr_partitions) == -1) +...

...16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/generator/structs.ml b/generator/structs.ml > index 6017ba6..d986fd9 100644 > --- a/generator/structs.ml > +++ b/generator/structs.ml > @@ -442,8 +442,20 @@ let structs = [ > "im_device", FString; > "im_volume", FString; > ]; > - s_camel_name = "InternalMountable"; > - }; > + s_camel_name = "InternalMountable" }; Unneeded change. > + (* The Sleuth Kit directory entry information. *) > + { defaults with &g...

...uot;/etc/fstab") > 0) { - /* Ignore /dev/sda1 which is a shadow of the real root filesystem - * that is probably /dev/sda5 (see: - * http://www.freebsd.org/doc/handbook/disk-organization.html) - */ - if (m->im_type == MOUNTABLE_DEVICE && - match (g, m->im_device, re_first_partition)) - return 0; - fs->is_root = 1; fs->format = OS_FORMAT_INSTALLED; if (guestfs___check_freebsd_root (g, fs) == -1) @@ -225,14 +250,6 @@ check_filesystem (guestfs_h *g, const char *mountable, guestfs_is_file (g, "/netbsd") > 0 &a...

...n 0; @@ -95,8 +94,7 @@ guestfs_int_check_for_filesystem_on (guestfs_h *g, const char *mountable) } if (whole_device) { - if (extend_fses (g) == -1) - return -1; + extend_fses (g); fs = &g->fses[g->nr_fses-1]; r = guestfs_int_check_installer_iso (g, fs, m->im_device); @@ -145,8 +143,7 @@ check_filesystem (guestfs_h *g, const char *mountable, /* Not CLEANUP_FREE, as it will be cleaned up with inspection info */ char *windows_systemroot = NULL; - if (extend_fses (g) == -1) - return -1; + extend_fses (g); if (!whole_device && m->im_ty...

Hey there! Here are a few patches to fix unrelated things: one fixes the configure for older ncurses releases having no pkg-config files. The other two are fixing what Richard mentioned about guestfs subvolumes display Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case

...ail.com> --- generator/structs.ml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..d986fd9 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,20 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; - s_camel_name = "InternalMountable"; - }; + s_camel_name = "InternalMountable" }; + + (* The Sleuth Kit directory entry information. *) + { defaults with + s_name = "tsk_dirent"; + s_cols = [...

...gmail.com> --- generator/structs.ml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..4abb576 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,21 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; s_camel_name = "InternalMountable"; }; + + (* The Sleuth Kit directory entry information. *) + { defaults with + s_name = "tsk_dirent"; + s_cols = [ + "tsk_inode", FUInt64; + "tsk_t...

...etBSD you have this piece of code: /* Ignore /dev/sda1 which is a shadow of the real root filesystem * that is probably /dev/sda5 (see: * http://www.freebsd.org/doc/handbook/disk-organization.html) */ if (m->im_type == MOUNTABLE_DEVICE && match (g, m->im_device, re_first_partition)) return 0; This assumption is not always true. First of all, the MBR partition that hosts the disklabel could be any of the primary partitions. Not just the first one. The OpenBSD installer for example will by default use the 4th partition. I'm pretty sure you can ch...

...guestfs-internal.h" + + +char * +guestfs_impl_mountable_device (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + if ((mnt = guestfs_internal_parse_mountable (g, mountable))) + return safe_strdup(g, mnt->im_device); + + return NULL; +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + if ((mnt = guestfs_internal_parse_mountable (g, mountable))) + return safe_strdup(g, mnt-&g...

...+guestfs_impl_mountable_device (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL) + return NULL; + + return safe_strdup(g, mnt->im_device); +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL || STREQ (mnt->im_volume, "")...

...+ + +char * +guestfs_impl_mountable_device (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL) + return NULL; + + return safe_strdup (g, mnt->im_device); +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL || STREQ (mnt->im_volume, "")) { +...

...e filesystem, it can find deleted files." }; + ] (* Non-API meta-commands available only in guestfish. diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..9d2f309 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,18 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; - s_camel_name = "InternalMountable"; - }; + s_camel_name = "InternalMountable" }; + + (* The Sleuth Kit node info struct. *) + { defaults with + s_name = "tsk_node"; + s_cols = [ + "ts...

Hi all, Here is version 2 of the patch series, including the changes for Pino's remarks. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++

The ffind API allows to retrieve a file name from a device given its inode. The function returns a struct "tsknode" which contains the file name, its inode and it's allocation status. The struct will be employed by other APIs as well (fls, ifind etc..). $ ./run guestfish --ro -a /home/noxdafox/disks/ubuntu.qcow2 ><fs> run ><fs> ffind /dev/sda1 2 tsk_name: /

.../dev/sda2", "ext4"] libguestfs: trace: vfs_type "/dev/sda1" libguestfs: trace: vfs_type = "ext4" libguestfs: trace: internal_parse_mountable "/dev/sda1" libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > libguestfs: trace: is_whole_device "/dev/sda1" libguestfs: trace: is_whole_device = 0 libguestfs: trace: mount_ro "/dev/sda1" "/" libguestfs: trace: mount_ro = 0 libguestfs: trace: part_to_dev "/dev/sda1" libguestfs: trace:...

...-- a/tests/mountable/test-internal-parse-mountable.c +++ b/tests/mountable/test-internal-parse-mountable.c @@ -80,8 +80,7 @@ main (int argc, char *argv[]) if (mountable == NULL) goto error; if (mountable->im_type != MOUNTABLE_DEVICE || - STRNEQ ("/dev/VG/LV", mountable->im_device)) - { + STRNEQ ("/dev/VG/LV", mountable->im_device)) { fprintf (stderr, "incorrectly parsed /dev/VG/LV: im_device=%s\n", mountable->im_device); goto error; @@ -94,12 +93,11 @@ main (int argc, char *argv[]) if (mountable->im_type != MOU...

...ot;ext4"] > libguestfs: trace: vfs_type "/dev/sda1" > libguestfs: trace: vfs_type = "ext4" > libguestfs: trace: internal_parse_mountable "/dev/sda1" > libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > > libguestfs: trace: is_whole_device "/dev/sda1" > libguestfs: trace: is_whole_device = 0 > libguestfs: trace: mount_ro "/dev/sda1" "/" > libguestfs: trace: mount_ro = 0 > libguestfs: trace: part_to_dev "/dev/sda1&...

Hi there, Latest and greatest version including all new remarks from both Pino and Rich. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++ m4/guestfs_libraries.m4

...;] >> libguestfs: trace: vfs_type "/dev/sda1" >> libguestfs: trace: vfs_type = "ext4" >> libguestfs: trace: internal_parse_mountable "/dev/sda1" >> libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > >> libguestfs: trace: is_whole_device "/dev/sda1" >> libguestfs: trace: is_whole_device = 0 >> libguestfs: trace: mount_ro "/dev/sda1" "/" >> libguestfs: trace: mount_ro = 0 >> libguestfs: trace: part_to_dev &...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67