search for: do_aug_init

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

...nit time loading them later; however, this is what the AUG_NO_LOAD flag (= 32) does already. --- daemon/augeas.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/augeas.c b/daemon/augeas.c index ce49726..4f1d9a8 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags) return -1; } + /* Filter out AUG_NO_STDINC, since the lenses in our custom path + * need the lenses from the system path. + */ + flags &= ~AUG_NO_STDINC; + /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ aug = aug_init (buf, &qu...

...ever don't fail to +dnl compile just because this is not satisfied. PKG_CHECK_MODULES([AUGEAS],[augeas >= 1.0.0]) dnl libmagic (highly recommended) diff --git a/daemon/augeas.c b/daemon/augeas.c index ce49726..9c8bbcc 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -134,7 +134,7 @@ do_aug_init (const char *root, int flags) } /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ - aug = aug_init (buf, "/usr/share/guestfs/", flags | AUG_NO_ERR_CLOSE); + aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); if (!aug) { reply_with_error ("augeas in...

...rote: > 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 on the stable-1.22 branch. Does simply reverting > that patch fix the problem? If so I will push a revert commit. AUG_NO_ERR_CLOSE is not a define but an...

...; --- > > > > daemon/augeas.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/daemon/augeas.c b/daemon/augeas.c > > index ce49726..4f1d9a8 100644 > > --- a/daemon/augeas.c > > +++ b/daemon/augeas.c > > @@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags) > > > > return -1; > > > > } > > > > + /* Filter out AUG_NO_STDINC, since the lenses in our custom path > > + * need the lenses from the system path. > > + */ > > + flags &= ~AUG_NO_STDINC; &...

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

...al 8 > drwxr-xr-x 2 root root 4096 Oct 26 15:31 . > drwxr-xr-x 24 root root 4096 Oct 14 13:27 .. > > > # guestmount -a /vm/images/archlinux/archlinux.qcow2 -i /mnt/ > > warning: Unable to get device geometry for /var/tmp/guestfs.jmCrFb/root > libguestfs: error: aug_init: do_aug_init: function not available What version of libguestfs and what host are you running it on? You could try a couple of things: (1) Use: virt-filesystems -a /vm/images/archlinux/archlinux.qcow2 --all --long -h to list out the filesystems in the image, then try mounting them manually, as in this ex...

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 on the stable-1.22 branch. Does simply reverting that patch fix the problem? If so I will push a revert commit. Rich. -- Richard Jones, Virtualization Group, Red Hat htt...

...what the AUG_NO_LOAD flag (= 32) does already. > --- > daemon/augeas.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/daemon/augeas.c b/daemon/augeas.c > index ce49726..4f1d9a8 100644 > --- a/daemon/augeas.c > +++ b/daemon/augeas.c > @@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags) > return -1; > } > > + /* Filter out AUG_NO_STDINC, since the lenses in our custom path > + * need the lenses from the system path. > + */ > + flags &= ~AUG_NO_STDINC; This is wrong. It should be possible to specify this, plus...

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

...augeas.c | 5 +++++ > > > 1 file changed, 5 insertions(+) > > > > > > diff --git a/daemon/augeas.c b/daemon/augeas.c > > > index ce49726..4f1d9a8 100644 > > > --- a/daemon/augeas.c > > > +++ b/daemon/augeas.c > > > @@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags) > > > > > > return -1; > > > > > > } > > > > > > + /* Filter out AUG_NO_STDINC, since the lenses in our custom path > > > + * need the lenses from the system path. > > > + */ &gt...

...c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009-2012 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,7 +99,7 @@ do_aug_init (const char *root, int flags) return 0; #else - NOT_AVAILABLE (-1); + NOT_AVAILABLE (augeas, -1); #endif } @@ -114,7 +114,7 @@ do_aug_close (void) return 0; #else - NOT_AVAILABLE (-1); + NOT_AVAILABLE (augeas, -1); #endif } @@ -133,7 +133,7 @@ do_aug_defvar (const char *name...

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

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.

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

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

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