[Fai-commit] r6011 - in branches/stable/3.4: debian lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:21 +0000 (Tue, 17 Aug 2010)
New Revision: 6011

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


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:17 UTC (rev 6010)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:21 UTC (rev 6011)
@@ -65,6 +65,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: branches/stable/3.4/lib/subroutines
===================================================================
--- branches/stable/3.4/lib/subroutines	2010-08-17 12:56:17 UTC (rev 6010)
+++ branches/stable/3.4/lib/subroutines	2010-08-17 12:56:21 UTC (rev 6011)
@@ -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: "