search for: augeas_error

The following patch adds augeas_error to the Sys::VirtConvert::Util use statement for GrubLegacy (matching what is used in the Grub2 package). This is required to prevent an undefined subroutine error for the augeas_error call in list_kernels(). There are also a few minor typo fixups: - A message string in _configure_kernel was miss...

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

Hi, this series improves the way LVM is used in the appliance: in particular, now lvmetad can eventually run at all, and with the correct configuration. Also improve the listing strategies. Changes in v2: - dropped patch #5, will be sent separately - move lvmetad statup in own function (patch #2) Thanks, Pino Toscano (4): daemon: lvm-filter: set also global_filter daemon: lvm-filter:

...eleases don't have have uncommented "filter" lines, so the current way to edit lvm.conf doesn't work anymore. Instead, switch to augeas (with a "custom" len) for a cleaner and working way to set the lvm filter. Pino Toscano (3): daemon: add add_sprintf daemon: move AUGEAS_ERROR to the common header daemon: lvm-filter: use augeas for setting the filter appliance/Makefile.am | 6 +- appliance/guestfs_lvm_conf.aug | 74 +++++++++++++++++ daemon/augeas.c | 17 ---- daemon/daemon.h | 19 +++++ daemon/guestfsd.c | 20...

Hi, this series improves the way LVM is used in the appliance: in particular, now lvmetad can eventually run at all, and with the correct configuration. Also improve the listing strategies. Thanks, Pino Toscano (5): daemon: lvm-filter: set also global_filter daemon: lvm-filter: start lvmetad better daemon: lvm: improve filter for LVs with activationskip flag set daemon: lvm: list

Simplify how we handle lvm.conf.

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (4): daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas APIs to OCaml daemon: drop usage of C

...iled"); @@ -148,25 +148,6 @@ do_aug_init (const char *root, int flags) return -1; } - if (!augeas_is_version (1, 2, 1)) { - int r = aug_transform (aug, "guestfs_shadow", "/etc/shadow", - 0 /* = included */); - if (r == -1) { - AUGEAS_ERROR ("aug_transform"); - aug_close (aug); - aug = NULL; - return -1; - } - - /* If aug_load was implicitly called, reload the handle. */ - if ((flags & AUG_NO_LOAD) == 0) { - if (aug_load (aug) == -1) { - AUGEAS_ERROR ("aug_load"); - re...

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Changes from v2: - dropped patch #1, as it was applied already (was a real bugfix) - rebased on master Pino Toscano (3): Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas

...} + } + + # If it wasn't there, add it + unless ($found) { + $g->aug_set("/augeas/load/Grub/incl[last()+1]", $self->{grub_conf}); + + # Make augeas pick up the new configuration + $g->aug_load(); + } + }; + augeas_error($g, $@) if ($@); + + return $self; +} + +sub list_kernels +{ + my $self = shift; + + my $g = $self->{g}; + my $grub_conf = $self->{grub_conf}; + my $grub_fs = $self->{grub_fs}; + + # Look for a kernel, starting with the default + my @paths = eval { + # Get a lis...

...} + } + + # If it wasn't there, add it + unless ($found) { + $g->aug_set("/augeas/load/Grub/incl[last()+1]", $self->{grub_conf}); + + # Make augeas pick up the new configuration + $g->aug_load(); + } + }; + augeas_error($g, $@) if ($@); + + return $self; +} + +sub list_kernels +{ + my $self = shift; + + my $g = $self->{g}; + my $grub_conf = $self->{grub_conf}; + my $grub_fs = $self->{grub_fs}; + + # Look for a kernel, starting with the default + my @paths = eval { + # Get a lis...

This synchronizes the embedded ocaml-augeas copy, and reimplements the augeas APIs using it (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (5): common/mlaugeas: Synchronize with latest ocaml-augeas daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement

This is a new conversion module to convert SUSE Linux and openSUSE guests. The converter is based on the RedHat module, and should offer the same functionality on both SUSE and RedHat hosts. There are a few additional messages in this module, such as reporting of packages when installing through zypper or the local virt-v2v repo. These messages don't necessarily flow unless verbose switches

v2 of previous patch, which fixes some missing bits. For now I'm going to go with Pino's RHEL 7.1 patch, since it is at least smaller than this. So I'm sending this to the list just to have it archived for later. Rich.

...c > +++ b/daemon/lvm-filter.c > @@ -133,18 +133,6 @@ set_filter (char *const *filters) > return -1; > } > > - r = aug_transform (aug, "guestfs_lvm_conf", "/lvm/lvm.conf", > - 0 /* = included */); > - if (r == -1) { > - AUGEAS_ERROR ("aug_transform"); > - return -1; > - } > - > - if (aug_load (aug) == -1) { > - AUGEAS_ERROR ("aug_load"); > - return -1; > - } > - > /* Remove all the old filters ... */ > r = aug_rm (aug, "/files/lvm/lvm.conf/devices/dict/fi...

...my $self = shift; @@ -61,15 +131,15 @@ sub check_efi # Methods for inspecting and manipulating grub legacy -package Sys::VirtConvert::Converter::RedHat::GrubLegacy; +package Sys::VirtConvert::Converter::Linux::GrubLegacy; -use Sys::VirtConvert::Util; +use Sys::VirtConvert::Util qw(:DEFAULT augeas_error); use File::Basename; use Locale::TextDomain 'virt-v2v'; -@Sys::VirtConvert::Converter::RedHat::GrubLegacy::ISA = - qw(Sys::VirtConvert::Converter::RedHat::Grub); +@Sys::VirtConvert::Converter::Linux::GrubLegacy::ISA = + qw(Sys::VirtConvert::Converter::Linux::Grub); sub new...

...my $self = shift; @@ -61,15 +131,15 @@ sub check_efi # Methods for inspecting and manipulating grub legacy -package Sys::VirtConvert::Converter::RedHat::GrubLegacy; +package Sys::VirtConvert::Converter::Linux::GrubLegacy; -use Sys::VirtConvert::Util; +use Sys::VirtConvert::Util qw(:DEFAULT augeas_error); use File::Basename; use Locale::TextDomain 'virt-v2v'; -@Sys::VirtConvert::Converter::RedHat::GrubLegacy::ISA = - qw(Sys::VirtConvert::Converter::RedHat::Grub); +@Sys::VirtConvert::Converter::Linux::GrubLegacy::ISA = + qw(Sys::VirtConvert::Converter::Linux::Grub); sub new...

In preparation for an upcoming patch which adds support for SUSE guest conversions, it makes sense to have an intermediate steps that changes the RedHat.pm converter into a more generic Linux converter. The SUSE changes will then be limited in scope to only what is required for SUSE support. This series of patches accomplishes the following: - Renames RedHat.pm to Linux.pm - Modifies Linux.pm

...foreach my $augpath ($g->aug_match('/files/boot/grub/menu.lst/title/kernel')) { - return if ($g->aug_get($augpath) eq $kernel); + return 1 if ($grubfs.$g->aug_get($augpath) eq $kernel); } + + return 0 }; augeas_error($g, $@) if ($@); - my $prefix; - if ($desc->{boot}->{grub_fs} eq "/boot") { - $prefix = ''; - } else { - $prefix = '/boot'; - } - my $initrd = "$prefix/initrd-$version.img"; $kernel =~ m{^/boot/(.*)$} or die("kerne...

...detected, but uninstallation '. + 'failed. The error message was: {error}', + error => $@)) if $@; + + # Reload augeas to detect changed made by vmware tools uninstallation + eval { $g->aug_load() }; + augeas_error($g, $@) if $@; + } } # Get a list of all foreign hypervisor specific kernel modules which are being -- 1.7.3.5