search for: add_fstab_entry

...90,8 @@ static int check_hostname_unix (guestfs_h *g, struct inspect_fs *fs); static int check_hostname_redhat (guestfs_h *g, struct inspect_fs *fs); static int check_hostname_freebsd (guestfs_h *g, struct inspect_fs *fs); static int check_fstab (guestfs_h *g, struct inspect_fs *fs); -static int add_fstab_entry (guestfs_h *g, struct inspect_fs *fs, - const char *mountable, const char *mp); +static void add_fstab_entry (guestfs_h *g, struct inspect_fs *fs, + const char *mountable, const char *mp); static char *resolve_fstab_device (guestfs_h *g, const...

Only change from previous post is explicitly checking md_map for NULL before hash_free and lookup.

These patches are rebased on top of current master. In addition, I've made the following changes: * Fixed whitespace error. * Functions return -1 on error. * Added a debug message when guest contains md devices, but nothing was parsed from mdadm.conf.

--- extratests/suppressions | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/extratests/suppressions b/extratests/suppressions index 97d4b78..78ca4ab 100644 --- a/extratests/suppressions +++ b/extratests/suppressions @@ -3,19 +3,19 @@ Memcheck:Cond fun:* fun:numa_node_size64 - fun:numa_init + obj:/usr/lib64/libnuma.so.1 } {

...{ - free (spec); - goto error; - } + for (char **entry = entries; *entry != NULL; entry++) { + if (asprintf (&augpath, "%s/spec", *entry) == -1) g->abort_cb(); + char *spec = guestfs_aug_get (g, augpath); + if (spec == NULL) goto error; - int r = add_fstab_entry (g, fs, spec, mp, md_map); + if (asprintf (&augpath, "%s/file", *entry) == -1) g->abort_cb(); + char *mp = guestfs_aug_get (g, augpath); + if (mp == NULL) { free (spec); - free (mp); - - if (r == -1) goto error; + goto error; } + + int r = add...

In inspect-fs-unix.c:1197 in add_fstab_entry() then too. On 02/06/15 18:39, Richard W.M. Jones wrote: > On Tue, Jun 02, 2015 at 06:37:06PM +0300, Nikos Skalkotos wrote: >> Sorry, I don't get it. In inspect.c line 67 you have this: >> >> for (fs = fses; *fs; fs += 2) { >> if (guestfs_int_check_for_filesys...

This series fixes inspection in the case that fstab contains references to md devices. I've made a few changes since the previous posting, which I've summarised below. [PATCH 1/8] build: Create an MD variant of the dummy Fedora image I've double checked that no timestamp is required in the Makefile. The script will not run a second time to build fedora-md2.img. [PATCH 2/8] build:

Is btrfs subvol support failing just for me? Looks like nothing adds the required '@/' string. virt-ls uses the first variant of the command: ><rescue> mount -vo subvol=var/spool,ro /dev/sda2 /sysroot/ [ 113.852047] BTRFS info (device sda2): disk space caching is enabled [ 113.852869] BTRFS: has skinny extents mount: mount(2) failed: No such file or directory ><rescue>

...= OS_TYPE_LINUX; + fs->distro = OS_DISTRO_COREOS; + + /* Determine hostname. */ + if (check_hostname_unix (g, fs) == -1) + return -1; + + /* CoreOS does not contain /etc/fstab to determine the mount points. + * Associate this filesystem with the "/" mount point. + */ + if (add_fstab_entry (g, fs, fs->mountable, "/") == -1) + return -1; + + return 0; +} + +/* The currently mounted device looks like a CoreOS /usr. In CoreOS + * the read-only /usr contains the OS version. The /etc/os-release is a + * link to /usr/share/coreos/os-release. + */ +int +guestfs_int_check_co...

...= OS_TYPE_LINUX; + fs->distro = OS_DISTRO_COREOS; + + /* Determine hostname. */ + if (check_hostname_unix (g, fs) == -1) + return -1; + + /* CoreOS does not contain /etc/fstab to determine the mount points. + * Associate this filesystem with the "/" mount point. + */ + if (add_fstab_entry (g, fs, fs->mountable, "/") == -1) + return -1; + + return 0; +} + +/* The currently mounted device looks like a CoreOS /usr. In CoreOS + * the read-only /usr contains the OS version. The /etc/os-release is a + * link to /usr/share/coreos/os-release. + */ +int +guestfs_int_check_co...

[PATCH 1/7] mount: Add mount_vfs_nochroot This is significantly reworked from before. umount is gone as discussed, and variable motion is minimised. [PATCH 2/7] btrfs: Update btrfs_subvolume_list to take Already provisionally ACKed. Previous comment was that cleanup could be tidier. I looked into creating a new cleanup function for fs_buf, but it isn't possible (or simple, anyway) in this

Sorry, I don't get it. In inspect.c line 67 you have this: for (fs = fses; *fs; fs += 2) { if (guestfs_int_check_for_filesystem_on (g, *fs)) { guestfs_int_free_inspect_info (g); return NULL; } } I don't see the bug. On 02/06/15 18:30, Richard W.M. Jones wrote: > On Tue, Jun 02, 2015 at 06:18:38PM +0300, Nikos Skalkotos wrote: >> On 02/06/15 17:10,

...EXP (re_netbsd_dev, "^/dev/(l|s)d([0-9])([a-z])$", 0) static void check_architecture (guestfs_h *g, struct inspect_fs *fs); static int check_hostname_unix (guestfs_h *g, struct inspect_fs *fs); @@ -92,7 +93,8 @@ static int check_fstab (guestfs_h *g, struct inspect_fs *fs); static int add_fstab_entry (guestfs_h *g, struct inspect_fs *fs, const char *mountable, const char *mp); static char *resolve_fstab_device (guestfs_h *g, const char *spec, - Hash_table *md_map); + Hash_table *md_map, +...

...EXP (re_netbsd_dev, "^/dev/(l|s)d([0-9])([a-z])$", 0) static void check_architecture (guestfs_h *g, struct inspect_fs *fs); static int check_hostname_unix (guestfs_h *g, struct inspect_fs *fs); @@ -92,7 +93,8 @@ static int check_fstab (guestfs_h *g, struct inspect_fs *fs); static int add_fstab_entry (guestfs_h *g, struct inspect_fs *fs, const char *mountable, const char *mp); static char *resolve_fstab_device (guestfs_h *g, const char *spec, - Hash_table *md_map); + Hash_table *md_map, +...

This patch fixes inspection when fstab contains devices md devices specified as /dev/mdN. The appliance creates these devices without reference to the guest's mdadm.conf so, for e.g. /dev/md0 in the guest will often be created as /dev/md127 in the appliance. With this patch, we match the uuids of detected md devices against uuids specified in mdadm.conf, and map them appropriately when we

The first three patches were posted previously: https://www.redhat.com/archives/libguestfs/2010-July/msg00082.html The last two patches in this series change guestfish -i to use this new code. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to

These three patches (two were previously posted) can do simple operating system inspection in C. Example of use: ><fs> add-ro rhel55.img ><fs> run ><fs> inspect-os /dev/VolGroup00/LogVol00 ><fs> inspect-get-type /dev/VolGroup00/LogVol00 linux ><fs> inspect-get-distro /dev/VolGroup00/LogVol00 rhel ><fs> inspect-get-arch

Previously discussed here: https://www.redhat.com/archives/libguestfs/2010-August/msg00002.html -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

...uot;%s/value", *opt); + subvol = guestfs_aug_get (g, augpath); + if (subvol == NULL) return -1; + + new = safe_asprintf (g, "btrfsvol:%s/%s", mountable, subvol); + free (mountable); + mountable = new; + } + } + } + + if (add_fstab_entry (g, fs, mountable, mp) == -1) return -1; + } + + return 0; +} + +static int +check_systemd_mounts (guestfs_h *g, struct inspect_fs *fs) +{ + const char *dirs[] = {"/etc/systemd/", "/lib/systemd/", + "/usr/lib/systemd/", NULL}; + const char **dir; + for (dir = d...

Adds support for systemd .mount files, uses Augeas to extract mount points. Fixes RHBZ#1113153. Maros Zatko (1): inspection: add support for systemd .mount files src/inspect-fs-unix.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) -- 1.9.3