search for: ce49726

...sible 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 +++++ 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; +...

...ght at init 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 cus...

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

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

...will fail unless you have Augeas 1.2.0 +dnl some upstream but not released patches. However 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 (b...

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.

...stfs_int_program_name, guestfs_int_program_name, - guestfs_int_program_name); + guestfs_int_program_name, guestfs_int_program_name, + guestfs_int_program_name, guestfs_int_program_name); } exit (status); } diff --git a/daemon/augeas.c b/daemon/augeas.c index ce49726..59d3508 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -39,9 +39,9 @@ const char *minor = aug_error_minor_message (aug); \ const char *details = aug_error_details (aug); \ fprintf (stderr, fs ": %s%s%s%s%s", ##__VA_ARGS__,...

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