[Fai-commit] r5885 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2010-07-27 22:44:16 +0000 (Tue, 27 Jul 2010)
New Revision: 5885

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines
Log:
subroutines: new subroutine umount_csspace, so it can be used in user
hooks (thanks to Waldemar for the patch)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-27 22:09:16 UTC (rev 5884)
+++ trunk/debian/changelog	2010-07-27 22:44:16 UTC (rev 5885)
@@ -67,6 +67,8 @@
   * mkramdisk: add option -a, remove use of FAI_NORAMDISK,
     use FAI_RAMDISKS
   * subroutines: adjust to new option of mkramdisks
+  * subroutines: new subroutine umount_csspace, so it can be used in user
+    hooks (thanks to Waldemar for the patch)
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2010-07-27 22:09:16 UTC (rev 5884)
+++ trunk/lib/subroutines	2010-07-27 22:44:16 UTC (rev 5885)
@@ -86,6 +86,15 @@
     dmesg > $LOGDIR/dmesg.log
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+umount_csspace() {
+
+    # 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
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 jobsrunning() {
 
     # test if jobs are running
@@ -614,13 +623,8 @@
     # save again, because new messages could be created
     save_dmesg
     task savelog
+    umount_csspace
 
-    # 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: "