From b52183b5491748d9e979d30e55db6d648b102416 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 9 Nov 2010 14:50:23 +0000 Subject: [PATCH] lib: Augeas (client side) is not needed by the library. However it is used by the daemon. --- README | 4 ++-- configure.ac | 4 ---- src/inspect.c | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README b/README index 07915e4..b6a7088 100644 --- a/README +++ b/README @@ -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 d6472a5..4458d49 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 b06c8f6..52b0b8c 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -29,7 +29,6 @@ #include #include #include -#include #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). */ -- 1.8.3.1