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

[Thomas Lange]

Author: lange
Date: 2009-07-20 22:29:20 +0000 (Mon, 20 Jul 2009)
New Revision: 5466

Modified:
   trunk/bin/fai-chboot
   trunk/debian/changelog
Log:
fai-chboot: ignore ~ and .bak entries

Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2009-07-20 22:25:30 UTC (rev 5465)
+++ trunk/bin/fai-chboot	2009-07-20 22:29:20 UTC (rev 5466)
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 3.4.5 17-april-2009";
+$version="version 3.4.6 21-july-2009";
 
 use Socket;
 use Net::hostent;
@@ -80,6 +80,8 @@
   opendir(DIR, $pxedir) || die "Can't opendir $pxedir: $!";
   foreach (readdir(DIR)) {
     next if /^\./;
+    next if /~$/;
+    next if /\.bak$/;
     if (/^(default|[0-9A-F]+)$/) { push @enabled,   $_ ; next}
     if (/\.tmpl$/)               { push @templates, $_ ; next}
     if (/\.disable$/) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-20 22:25:30 UTC (rev 5465)
+++ trunk/debian/changelog	2009-07-20 22:29:20 UTC (rev 5466)
@@ -1,4 +1,4 @@
-fai (3.2.22) unstable; urgency=low
+fai (3.2.22~beta2) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -37,6 +37,7 @@
     use the comma separated list of $ADDCLASSES for classes (closes: 497548)
   * fai-class.1: add ADDCLASS feature
   * package_config/FAIBASE: remove rsh-client
+  * fai-chboot: ignore ~ and .bak entries
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if