lib: Augeas (client side) is not needed by the library.

However it is used by the daemon.

Cherry picked from commit b52183b5491748d9e979d30e55db6d648b102416.

diff --git a/README b/README
index a88f4cc..6a9cbd1 100644 (file)
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ Requirements
 
 - libxml2
 
-- Augeas (http://augeas.net/)
+- Augeas (http://augeas.net/) (optional)
 
 - squashfs-tools (mksquashfs only)
 

diff --git a/configure.ac b/configure.ac
index c75e3aa..c18d7fa 100644 (file)
--- 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 e7b1e41..2ff4e37 100644 (file)
--- 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"
@@ -858,7 +857,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). */