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

[Thomas Lange]

Author: lange
Date: 2010-01-28 16:47:25 +0000 (Thu, 28 Jan 2010)
New Revision: 5710

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: ignore backup files when executing hooks

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-01-27 16:45:21 UTC (rev 5709)
+++ trunk/bin/make-fai-nfsroot	2010-01-28 16:47:25 UTC (rev 5710)
@@ -6,7 +6,7 @@
 # make-fai-nfsroot -- create nfsroot directory and add additional packages
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2009 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2010 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # (c) 2004      by Henning Glawe, glaweh at physik.fu-berlin.de
 # Freie Universitaet Berlin
@@ -33,7 +33,7 @@
 usage() {
 
     cat <<-EOF
-	Copyright (C) 1999-2009 Thomas Lange
+	Copyright (C) 1999-2010 Thomas Lange
 	Report bugs to <fai at informatik.uni-koeln.de>.
 
 	Usage: make-fai-nfsroot [OPTIONS]
@@ -465,7 +465,7 @@
     fi
     if [ -d "$NFSROOT_HOOKS"  ]; then
         echo "Running hooks..."
-        for file in $(ls $NFSROOT_HOOKS/* 2>/dev/null); do
+        for file in $(ls $NFSROOT_HOOKS/* 2>/dev/null | egrep '^[[:alnum:]_.-]+$'); do
             . $file
         done
     fi

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-27 16:45:21 UTC (rev 5709)
+++ trunk/debian/changelog	2010-01-28 16:47:25 UTC (rev 5710)
@@ -17,6 +17,7 @@
   * install_packages: aptitude-r now uses MAXPACKAGES, thanks to Stefan
     Goetz for the bug report and the patch (closes: #558139)
   * mount2dir, subroutines: handle mount errors (closes: #557082)
+  * make-fai-nfsroot: ignore backup files when executing hooks
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2