Blame SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch

84dac3
From 898ea6cd04163b38aa59b0c3d9df23cf1837d425 Mon Sep 17 00:00:00 2001
84dac3
From: Dominic Cleal <dcleal@redhat.com>
84dac3
Date: Fri, 12 Jun 2015 10:46:57 +0100
84dac3
Subject: [PATCH] UpdateDB: autoload /etc/updatedb.conf with Simplevars
84dac3
84dac3
updatedb.conf was loaded with Simplevars in Augeas 1.1.0, so continue
84dac3
for compatibility.  Use aug_transform, augtool --transform etc. to use
84dac3
the newer, different, UpdateDB lens.
84dac3
---
84dac3
 lenses/simplevars.aug | 1 +
84dac3
 lenses/updatedb.aug   | 8 --------
84dac3
 2 files changed, 1 insertion(+), 8 deletions(-)
84dac3
84dac3
diff --git a/lenses/simplevars.aug b/lenses/simplevars.aug
84dac3
index ad9795f0..ff0602cc 100644
84dac3
--- a/lenses/simplevars.aug
84dac3
+++ b/lenses/simplevars.aug
84dac3
@@ -41,6 +41,7 @@ let lns = (Util.empty | Util.comment | entry)*
84dac3
 (* Variable: filter *)
84dac3
 let filter = incl "/etc/kernel-img.conf"
84dac3
            . incl "/etc/kerneloops.conf"
84dac3
+           . incl "/etc/updatedb.conf"
84dac3
            . incl "/etc/wgetrc"
84dac3
            . incl "/etc/zabbix/*.conf"
84dac3
            . incl "/etc/audit/auditd.conf"
84dac3
diff --git a/lenses/updatedb.aug b/lenses/updatedb.aug
84dac3
index 40cd26fb..c7309b16 100644
84dac3
--- a/lenses/updatedb.aug
84dac3
+++ b/lenses/updatedb.aug
84dac3
@@ -22,8 +22,6 @@ About: Examples
84dac3
 
84dac3
 module UpdateDB =
84dac3
 
84dac3
-autoload xfm
84dac3
-
84dac3
 (* View: list
84dac3
      A list entry *)
84dac3
 let list =
84dac3
@@ -41,9 +39,3 @@ let bool = [ key "PRUNE_BIND_MOUNTS" . Sep.space_equal
84dac3
 (* View: lns
84dac3
      The <UpdateDB> lens *)
84dac3
 let lns = (Util.empty|Util.comment|list|bool)*
84dac3
-
84dac3
-(* Variable: filter
84dac3
-      The filter *)
84dac3
-let filter = incl "/etc/updatedb.conf"
84dac3
-
84dac3
-let xfm = transform lns filter
84dac3
-- 
7b8067
2.14.3
84dac3