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

[Thomas Lange]

Author: lange
Date: 2009-04-09 12:32:11 +0000 (Thu, 09 Apr 2009)
New Revision: 5305

Modified:
   trunk/bin/fai-do-scripts
   trunk/debian/changelog
Log:
fai-do-scripts: skip files with certain suffixes (closes: #500579)

Modified: trunk/bin/fai-do-scripts
===================================================================
--- trunk/bin/fai-do-scripts	2009-04-09 12:11:54 UTC (rev 5304)
+++ trunk/bin/fai-do-scripts	2009-04-09 12:32:11 UTC (rev 5305)
@@ -5,7 +5,7 @@
 # fai-do-scripts - call configuration scripts for every defined class
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2003-2008 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2003-2009 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.6.1, 9-aug-2008"
+version="version 1.6.2, 9-apr-2009"
 
 # variables needed: $classes, $cfclasses, $LOGDIR
 # 
@@ -86,8 +86,10 @@
 
     # may be remove some day
     case $file in
-	*~) [ "$debug" ] && echo "Skipping backup file $file"
-	    return ;;
+	*~) [ "$debug" ] && echo "Skipping backup file $file";	 return ;;
+	*.dpkg-old) [ "$debug" ] && echo "Skipping file $file";	 return ;;
+	*.dpkg-new) [ "$debug" ] && echo "Skipping file $file";	 return ;;
+	*.dpkg-inst) [ "$debug" ] && echo "Skipping file $file"; return ;;
     esac
 
     name=$(basename $file)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 12:11:54 UTC (rev 5304)
+++ trunk/debian/changelog	2009-04-09 12:32:11 UTC (rev 5305)
@@ -7,6 +7,7 @@
   * new file live.conf will disable some messages during booting
   * make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
     -k now also upgrades all packages inside the nfsroot
+  * fai-do-scripts: skip files with certain suffixes (closes: #500579)
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -57,7 +58,7 @@
     initialization of encrypted partitions configurable
   * setup-storage.8: Document new encryption possibilities
 
- -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:11:42 +0200
+ -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:31:39 +0200
 
  (3.2.17) unstable; urgency=medium