[Fai-commit] r4921 - trunk/lib

[lange at alioth.debian.org]

Author: lange
Date: 2008-05-27 13:33:30 +0000 (Tue, 27 May 2008)
New Revision: 4921

Modified:
   trunk/lib/subroutines
Log:
fix regex so softupdate will; now umount the config space


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2008-05-27 13:31:22 UTC (rev 4920)
+++ trunk/lib/subroutines	2008-05-27 13:33:30 UTC (rev 4921)
@@ -6,7 +6,7 @@
 # subroutines -- useful subroutines for FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2007 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2008 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -554,6 +554,12 @@
     save_dmesg
     task savelog
 
+    # umount config space if accessed via nfs
+    echo $FAI_CONFIG_SRC | grep -q ^nfs://
+    if [ $? -eq 0 ]; then
+	grep -q " $FAI nfs" /etc/mtab && umount $FAI
+    fi
+
     if [ -f $stamp ]; then
 	echo "Error while executing commands in subshell."
 	echo -n "$stamp was not removed. PID of running process: "
@@ -561,10 +567,6 @@
 	sendmon "TASKERROR softupdate 21"
 	die "Please look at the log files in $LOGDIR for errors."
     fi
-    echo $FAI_CONFIG_SRC | grep -q ^nfs://
-    if [ $? -eq 0 ]; then
-	grep -q ^$FAI /etc/mtab && umount $FAI
-    fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -