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

[Thomas Lange]

Author: lange
Date: 2009-07-20 10:35:59 +0000 (Mon, 20 Jul 2009)
New Revision: 5459

Modified:
   trunk/bin/fai-class
   trunk/debian/changelog
Log:
fai-class: do not remove additional-classes when in debug mode

Modified: trunk/bin/fai-class
===================================================================
--- trunk/bin/fai-class	2009-07-20 09:47:12 UTC (rev 5458)
+++ trunk/bin/fai-class	2009-07-20 10:35:59 UTC (rev 5459)
@@ -27,7 +27,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.5.7, 11-may-2009"
+version="version 1.5.8, 20-july-2009"
 
 # import variables: $LOGDIR $verbose $debug
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -77,7 +77,7 @@
 
     ex=$1
     cat <<-EOF
-	fai-class $version. Copyright (C) 2002-2005 Thomas Lange
+	fai-class $version. Copyright (C) 2002-2009 Thomas Lange
 	Report bugs to <fai at informatik.uni-koeln.de>.
 
 	Usage: fai-class [OPTION] DIRECTORY CLASSFILE
@@ -185,8 +185,12 @@
 
 if [ -f $LOGDIR/additional-classes ]; then
     cat $LOGDIR/additional-classes | addclass
-    rm -f $LOGDIR/additional-classes
-    # remove the file after it was used. Do not use the same file more than once.
+    if [ "$debug" ]; then
+	mv $LOGDIR/additional-classes $LOGDIR/additional-classes.used
+    else
+        # remove the file after it was used. Do not use the same file more than once.
+	rm -f $LOGDIR/additional-classes
+    fi
 fi
 
 # add all classes which are listed in a file with the hostname

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-20 09:47:12 UTC (rev 5458)
+++ trunk/debian/changelog	2009-07-20 10:35:59 UTC (rev 5459)
@@ -30,6 +30,7 @@
   * fai, fai.8: add option -s/--cspace to specify the config space URL
   * disk_config/*: add nosuid and nodev to some partitions
   * menu.lst/postinst: add /g to perl substitution command
+  * fai-class: do not remove additional-classes when in debug mode
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if