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

[Thomas Lange]

Author: lange
Date: 2010-02-17 12:33:29 +0000 (Wed, 17 Feb 2010)
New Revision: 5725

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: fix matching of hook names

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-02-07 15:07:51 UTC (rev 5724)
+++ trunk/bin/make-fai-nfsroot	2010-02-17 12:33:29 UTC (rev 5725)
@@ -465,8 +465,8 @@
     fi
     if [ -d "$NFSROOT_HOOKS"  ]; then
         echo "Running hooks..."
-        for file in $(ls $NFSROOT_HOOKS/* 2>/dev/null | egrep '^[[:alnum:]_.-]+$'); do
-            . $file
+        for file in $(cd $NFSROOT_HOOKS ;ls 2>/dev/null | egrep '^[[:alnum:]_.-]+$'); do
+            . $NFSROOT_HOOKS/$file
         done
     fi
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-02-07 15:07:51 UTC (rev 5724)
+++ trunk/debian/changelog	2010-02-17 12:33:29 UTC (rev 5725)
@@ -1,3 +1,9 @@
+fai (3.3.4~beta1) unstable; urgency=low
+
+  * make-fai-nfsroot: fix matching of hook names
+
+ -- Thomas Lange <lange at debian.org>  Wed, 17 Feb 2010 13:32:51 +0100
+
 fai (3.3.3) unstable; urgency=low
 
   [ Thomas Lange ]