[Fai-commit] r5712 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-01-29 04:59:51 +0000 (Fri, 29 Jan 2010)
New Revision: 5712

Modified:
   trunk/bin/fai-debconf
   trunk/debian/changelog
Log:
fai-debconf: ignore files that does not match the regex

Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2010-01-28 17:11:37 UTC (rev 5711)
+++ trunk/bin/fai-debconf	2010-01-29 04:59:51 UTC (rev 5712)
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.3.1, 18-january-2010"
+version="version 1.3.2, 18-january-2010"
 
 # variables needed: $classes, $ROOTCMD, $LOGDIR, $target
     
@@ -39,7 +39,7 @@
     for class in $classes ; do
 	[ -f $class ] && add_data $class
 	if [ -d $class ]; then
-	   for f in $(ls $class/* | grep -v ~$) ; do
+	   for f in $(ls $class/* | egrep '^[[:alnum:]_.-]+$') ; do
 	       [ -f $f ] && add_data $f
 	   done
 	fi
@@ -89,7 +89,7 @@
 
     local ex=$1
     cat <<-EOF
-    fai-debconf $version. Copyright (C) 2005-2006 Thomas Lange
+    fai-debconf $version. Copyright (C) 2005-2010 Thomas Lange
     Report bugs to <fai at informatik.uni-koeln.de>.
 
     Usage: fai-debconf [OPTION] DIRECTORY

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-28 17:11:37 UTC (rev 5711)
+++ trunk/debian/changelog	2010-01-29 04:59:51 UTC (rev 5712)
@@ -20,6 +20,7 @@
   * make-fai-nfsroot: ignore backup files when executing hooks
   * install_packages: add support for zypper (install and remove packages)
     (closes: #514160)
+  * fai-debconf: ignore files that does not match the regex
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2