diff options
| author | Richard Jones <rjones@redhat.com> | 2010-11-09 14:50:23 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-11-10 10:34:48 +0000 |
| commit | b52183b5491748d9e979d30e55db6d648b102416 (patch) | |
| tree | 98fabab2e999736bafff99bc3f349c40523337bd | |
| parent | bf3b9e2e236b4dd2216200993ba39545ad5160bb (diff) | |
| download | libguestfs-b52183b5491748d9e979d30e55db6d648b102416.tar.gz libguestfs-b52183b5491748d9e979d30e55db6d648b102416.tar.xz libguestfs-b52183b5491748d9e979d30e55db6d648b102416.zip | |
lib: Augeas (client side) is not needed by the library.
However it is used by the daemon.
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/inspect.c | 3 |
3 files changed, 3 insertions, 8 deletions
@@ -55,9 +55,9 @@ Requirements - libxml2 -- gperf +- Augeas (http://augeas.net/) (optional) -- Augeas (http://augeas.net/) +- gperf - squashfs-tools (mksquashfs only) diff --git a/configure.ac b/configure.ac index d6472a52..4458d498 100644 --- a/configure.ac +++ b/configure.ac @@ -465,10 +465,6 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) AC_SUBST([LIBXML2_CFLAGS]) AC_SUBST([LIBXML2_LIBS]) -dnl Augeas (required) -PKG_CHECK_MODULES([AUGEAS], [augeas]) -AC_SUBST([AUGEAS_CFLAGS]) -AC_SUBST([AUGEAS_LIBS]) dnl hivex library (required) dnl This used to be a part of libguestfs, but was spun off into its diff --git a/src/inspect.c b/src/inspect.c index b06c8f68..52b0b8c8 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -29,7 +29,6 @@ #include <pcre.h> #include <magic.h> #include <hivex.h> -#include <augeas.h> #include "c-ctype.h" #include "ignore-value.h" @@ -841,7 +840,7 @@ check_linux_root (guestfs_h *g, struct inspect_fs *fs) * are mounted. * XXX What if !feature_available (g, "augeas")? */ - if (guestfs_aug_init (g, "/", AUG_NO_LOAD|AUG_SAVE_NOOP) == -1) + if (guestfs_aug_init (g, "/", 16|32) == -1) return -1; /* Tell Augeas to only load /etc/fstab (thanks Raphaël Pinson). */ |