[augeas-devel] [PATCH] Merged sysconfig.aug and ifcfg.aug in shellvars.aug, and added /etc/default/* to the list of supported configuration files

[Free Ekanayaka]

# HG changeset patch
# User Free Ekanayaka <free at 64studio.com>
# Date 1220707557 -7200
# Node ID b6dce69c2745729eba7ecce5c2b745d4f4fc725d
# Parent  ad4055fefacd08a14bf1531ecd8a7306daf575e3
Merged sysconfig.aug and ifcfg.aug in shellvars.aug, and added /etc/default/* to the list of supported configuration files

diff -r ad4055fefacd -r b6dce69c2745 lenses/ifcfg.aug
--- a/lenses/ifcfg.aug	Sat Sep 06 15:24:26 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-(* Parsing network-scripts/ifcfg-* config files *)
-module Ifcfg =
-  autoload xfm
-
-  let filter = (incl "/etc/sysconfig/network-scripts/ifcfg-*")
-      . Util.stdexcl
-
-  let xfm = transform Shellvars.lns filter
-
-(* Local Variables: *)
-(* mode: caml       *)
-(* End:             *)
diff -r ad4055fefacd -r b6dce69c2745 lenses/shellvars.aug
--- a/lenses/shellvars.aug	Sat Sep 06 15:24:26 2008 +0200
+++ b/lenses/shellvars.aug	Sat Sep 06 15:25:57 2008 +0200
@@ -1,6 +1,7 @@
 (* Generic lens for shell-script config files like the ones found *)
 (* in /etc/sysconfig                                              *)
 module Shellvars =
+  autoload xfm
 
   let eol = Util.eol
 
@@ -38,6 +39,60 @@ module Shellvars =
 
   let lns = (comment | source | kv) *
 
+  let sc_incl (n:string) = (incl ("/etc/sysconfig/" . n))
+  let filter_sysconfig = 
+      sc_incl "atd" .
+      sc_incl "authconfig" .
+      sc_incl "autofs" .
+      sc_incl "clock" .
+      sc_incl "cpuspeed" .
+      sc_incl "crond" .
+      sc_incl "crontab" .
+      sc_incl "desktop" .
+      sc_incl "firstboot" .
+      sc_incl "grub" .
+      sc_incl "hsqldb" .
+      sc_incl "httpd" .
+      sc_incl "i18n" .
+      sc_incl "init" .
+      sc_incl "iptables-config" .
+      sc_incl "irda" .
+      sc_incl "irqbalance" .
+      sc_incl "kdump" .
+      sc_incl "kernel" .
+      sc_incl "keyboard" .
+      sc_incl "kudzu" .
+      sc_incl "libvirtd" .
+      sc_incl "lircd" .
+      sc_incl "nasd" .
+      sc_incl "netconsole" .
+      sc_incl "network" .
+      sc_incl "nfs" .
+      sc_incl "ntpd" .
+      sc_incl "prelink" .
+      sc_incl "readonly-root" .
+      sc_incl "rsyslog" .
+      sc_incl "samba" .
+      sc_incl "saslauthd" .
+      sc_incl "selinux" .
+      sc_incl "smartmontools" .
+      sc_incl "spamassassin" .
+      sc_incl "sysstat" .
+      sc_incl "system-config-users" .
+      sc_incl "vncservers" .
+      sc_incl "wpa_supplicant" .
+      sc_incl "xend" .
+      sc_incl "xendomains"
+
+  let filter_ifcfg   = incl "/etc/sysconfig/network-scripts/ifcfg-*"
+  let filter_default = incl "/etc/default/*"
+  let filter = filter_sysconfig
+             . filter_ifcfg
+             . filter_default
+             . Util.stdexcl
+
+  let xfm = transform lns filter
+
 (* Local Variables: *)
 (* mode: caml       *)
 (* End:             *)
diff -r ad4055fefacd -r b6dce69c2745 lenses/sysconfig.aug
--- a/lenses/sysconfig.aug	Sat Sep 06 15:24:26 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-module Sysconfig =
-  autoload xfm
-
-  let sc_incl (n:string) = (incl ("/etc/sysconfig/" . n))
-
-  let filter = Util.stdexcl .
-      sc_incl "atd" .
-      sc_incl "authconfig" .
-      sc_incl "autofs" .
-      sc_incl "clock" .
-      sc_incl "cpuspeed" .
-      sc_incl "crond" .
-      sc_incl "crontab" .
-      sc_incl "desktop" .
-      sc_incl "firstboot" .
-      sc_incl "grub" .
-      sc_incl "hsqldb" .
-      sc_incl "httpd" .
-      sc_incl "i18n" .
-      sc_incl "init" .
-      sc_incl "iptables-config" .
-      sc_incl "irda" .
-      sc_incl "irqbalance" .
-      sc_incl "kdump" .
-      sc_incl "kernel" .
-      sc_incl "keyboard" .
-      sc_incl "kudzu" .
-      sc_incl "libvirtd" .
-      sc_incl "lircd" .
-      sc_incl "nasd" .
-      sc_incl "netconsole" .
-      sc_incl "network" .
-      sc_incl "nfs" .
-      sc_incl "ntpd" .
-      sc_incl "prelink" .
-      sc_incl "readonly-root" .
-      sc_incl "rsyslog" .
-      sc_incl "samba" .
-      sc_incl "saslauthd" .
-      sc_incl "selinux" .
-      sc_incl "smartmontools" .
-      sc_incl "spamassassin" .
-      sc_incl "sysstat" .
-      sc_incl "system-config-users" .
-      sc_incl "vncservers" .
-      sc_incl "wpa_supplicant" .
-      sc_incl "xend" .
-      sc_incl "xendomains"
-
-  let xfm = transform Shellvars.lns filter
-
-(* Local Variables: *)
-(* mode: caml       *)
-(* End:             *)