[netcf-devel] [PATCH 1/3] * src/drv_initscripts (augeas_xfm): exclude files ignored by initscripts

David Lutterkort lutter at redhat.com
Fri Sep 4 23:27:14 UTC 2009


initscripts ignores files whose name matches the regexp
  (~|\.bak|\.orig|\.rpmnew|\.rpmorig|\.rpmsave)$

(defined as __sed_discard_ignored_files in /etc/init.d/functions)

We now exclude those files.

Part of the fix for BZ 512950
---
 src/drv_initscripts.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 2874a9b..283b521 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -54,11 +54,14 @@ static const struct augeas_pv augeas_xfm[] = {
     { "/augeas/load/Ifcfg/lens", "Shellvars.lns" },
     { "/augeas/load/Ifcfg/incl",
       "/etc/sysconfig/network-scripts/ifcfg-*" },
-    { "/augeas/load/Ifcfg/excl[1]", "*.augnew" },
-    { "/augeas/load/Ifcfg/excl[2]", "*.augsave" },
-    { "/augeas/load/Ifcfg/excl[3]", "*.rpmsave" },
+    { "/augeas/load/Ifcfg/excl[1]", "*~" },
+    { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
+    { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
     { "/augeas/load/Ifcfg/excl[4]", "*.rpmnew" },
-    { "/augeas/load/Ifcfg/excl[5]", "*~" },
+    { "/augeas/load/Ifcfg/excl[5]", "*.rpmorig" },
+    { "/augeas/load/Ifcfg/excl[6]", "*.rpmsave" },
+    { "/augeas/load/Ifcfg/excl[7]", "*.augnew" },
+    { "/augeas/load/Ifcfg/excl[8]", "*.augsave" },
     /* iptables config */
     { "/augeas/load/Iptables/lens", "Iptables.lns" },
     { "/augeas/load/Iptables/incl", "/etc/sysconfig/iptables" },
-- 
1.6.2.5



More information about the netcf-devel mailing list