similar to: augeas changes in stable branches

On Fri, Oct 18, Richard W.M. Jones wrote: > On Fri, Oct 18, 2013 at 11:15:54AM +0200, Olaf Hering wrote: > > > > commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28 breaks compile with older > > augeas (0.7.4). AFAIK there is no requirement for augeas 1.0 until 1.24. > > > > augeas.c: In function 'do_aug_init': > > augeas.c:102:38: error:

Don't carry around Augeas lenses. It is fragile, since if the lens is added to upstream Augeas but the version number has not changed, then Augeas won't parse the target file at all. This specifically causes password adjustments to fail in RHEL 7.1. In future, if we need an Augeas lens, it must be added to Augeas, either upstream or as a downstream patch carried around by distros. ---

On Fri, Oct 18, 2013 at 11:15:54AM +0200, Olaf Hering wrote: > > commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28 breaks compile with older > augeas (0.7.4). AFAIK there is no requirement for augeas 1.0 until 1.24. > > augeas.c: In function 'do_aug_init': > augeas.c:102:38: error: 'AUG_NO_ERR_CLOSE' undeclared (first use in this function) That's a mistake

The lenses in our custom path need the system lens for base definitions. Disabling the system path was worthless anyway, since our API does not allow user-specified custom paths. The only possible use for AUG_NO_STDINC to aug-init could have been to not load the lenses right at init time loading them later; however, this is what the AUG_NO_LOAD flag (= 32) does already. --- daemon/augeas.c | 5

- bump the augeas requirement to 1.2.0, and drop an old hack - add a small helper in the generator Pino Toscano (3): build: raise augeas requirement to 1.2.0 appliance: remove custom Shadow augeas lens daemon: implement OptString for OCaml APIs appliance/Makefile.am | 6 +-- appliance/guestfs_shadow.aug | 72 ------------------------------------ daemon/augeas.c | 21

v3: - Don't remove the LVM transform.

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.

Hi, currently /etc/shadow is edited manually when needed (i.e. when setting the password for an user), and it is not changed when removing users. Import the upstream shadow.aug (currently in their development serie, but not part of any released version yet), and use it only when the augeas version is less than a potential 1.2.1 (covering also the case when the new version is just 1.3.0). Pino

On Monday 22 September 2014 13:50:18 Richard W.M. Jones wrote: > On Mon, Sep 22, 2014 at 10:49:42AM +0200, Pino Toscano wrote: > > The lenses in our custom path need the system lens for base > > definitions. Disabling the system path was worthless anyway, since > > our API does not allow user-specified custom paths. > > > > The only possible use for AUG_NO_STDINC

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 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

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

Augeas 1.7.0 was released a couple of days ago. By encouraging everyone to upgrade to this we can drop several calls to aug_transform and also our custom copies of two lenses, and a lot of related code. Rich.

Hi, newer lvm2 releases 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

On Mon, Sep 22, 2014 at 02:56:18PM +0200, Pino Toscano wrote: > On Monday 22 September 2014 13:50:18 Richard W.M. Jones wrote: > > On Mon, Sep 22, 2014 at 10:49:42AM +0200, Pino Toscano wrote: > > > The lenses in our custom path need the system lens for base > > > definitions. Disabling the system path was worthless anyway, since > > > our API does not allow

On Mon, Sep 22, 2014 at 10:49:42AM +0200, Pino Toscano wrote: > The lenses in our custom path need the system lens for base > definitions. Disabling the system path was worthless anyway, since our > API does not allow user-specified custom paths. > > The only possible use for AUG_NO_STDINC to aug-init could have been to > not load the lenses right at init time loading them

ocaml-augeas is used only by virtlibguestfs, so move it to this repository, instead of having it around in the common submodule. The removal from common will happen later. Pino Toscano (2): Bundle the ocaml-augeas library for use by libguestfs build: switch embedded copy of ocaml-augeas .gitignore | 1 + 3rdparty/ocaml-augeas/COPYING.LIB | 515

Since all the usage of augeas is done in OCaml parts (via ocaml-augeas), drop all the C code using the C augeas library. --- daemon/Makefile.am | 2 - daemon/augeas.c | 91 --------------------------------------------- daemon/cleanups.c | 11 ------ daemon/daemon.h | 34 ----------------- daemon/lvm-filter.c | 2 - docs/C_SOURCE_FILES | 1 - po/POTFILES | 1 - 7 files

Since all the usage of augeas is done in OCaml parts (via ocaml-augeas), drop all the C code using the C augeas library. --- daemon/Makefile.am | 2 - daemon/augeas.c | 91 --------------------------------------------- daemon/cleanups.c | 11 ------ daemon/daemon.h | 34 ----------------- daemon/lvm-filter.c | 2 - docs/C_SOURCE_FILES | 1 - po/POTFILES | 1 - 7 files

From: "Richard W.M. Jones" <rjones at redhat.com> Callers are supposed to use the availability API to check for functions that may not be available in particular builds of libguestfs. If they don't do this, currently they tend to get obscure error messages, eg: libguestfs: error: zerofree: /dev/vda1: zerofree: No such file or directory This commit changes the error