From d3543f398849fcaa722fdd1a14ae6dfd2d78597e Mon Sep 17 00:00:00 2001
From: frisco <>
Date: Mon, 12 Jan 2009 00:12:07 +0000
Subject: [PATCH] Added "deb-live/config/cnas-custom-settings.d" directory

---
 config/cnas-active-settings | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/cnas-active-settings b/config/cnas-active-settings
index 628f1f8..f3b9fdf 100644
--- a/config/cnas-active-settings
+++ b/config/cnas-active-settings
@@ -24,8 +24,17 @@ CNAS_CONFIG_DIR="config"
 
 . ${CNAS_CONFIG_DIR}/cnas-default-settings
 
+#Include files in "cnas-custom-settings.d" directory
+if [ -d ${CNAS_CONFIG_DIR}/cnas-custom-settings.d ]
+then
+    for include_file in `find ${CNAS_CONFIG_DIR}/cnas-custom-settings.d -type f -print`
+    do
+        . "$include_file"
+    done
+fi
 
-#Include cnas-custom-settings IFF this file exists
+#Include "cnas-custom-settings" IFF this file exists. Variables here can
+#override those in "cnas-custom-settings.d" directory.
 [ -f ${CNAS_CONFIG_DIR}/cnas-custom-settings ] && . ${CNAS_CONFIG_DIR}/cnas-custom-settings