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

[Thomas Lange]

Author: lange
Date: 2009-04-19 21:19:25 +0000 (Sun, 19 Apr 2009)
New Revision: 5365

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines
Log:
  include target directory information into stamp (closes: #503653)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-19 20:47:02 UTC (rev 5364)
+++ trunk/debian/changelog	2009-04-19 21:19:25 UTC (rev 5365)
@@ -40,6 +40,7 @@
   * subroutines: add trap for softupdates (closes: #449236)
     stop_fai_installation() sends message to faimond
     send TASKEND faiend message
+    include target directory information into stamp (closes: #503653)
   * packages_config/FAIBASE: add lvm2 (closes: #517417)
   * fai-chboot: always add $append to pxe configuration (closes: #495535)
   * fai-chboot.8: fix description of -i

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2009-04-19 20:47:02 UTC (rev 5364)
+++ trunk/lib/subroutines	2009-04-19 21:19:25 UTC (rev 5365)
@@ -6,7 +6,7 @@
 # subroutines -- useful subroutines for FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2008 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2009 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # (c) 2001-2005 by Henning Glawe, glaweh at physik.fu-berlin.de
 # Freie Universitaet Berlin
@@ -502,10 +502,20 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_dirinstall() {
 
-    echo $$ > $stamp
-
     mkdir -p $FAI_ROOT
     FAI_ROOT=$(cd $FAI_ROOT;pwd)
+    xstamp= ${FAI_ROOT//\//=}
+    stamp=/var/run/fai/dirinstall-$xstamp
+    unset xstamp
+
+    [ -f "$stamp" ] && {
+       echo -n "fai dirinstall into directory $FAI_ROOT already running or was aborted before. PID: "
+       cat $stamp
+       echo "You may remove $stamp and try again."
+       exit 1
+    }
+
+    echo $$ > $stamp
     echo "Installing into directory $FAI_ROOT"
     task extrbase
     [ -f $target/etc/fstab ] || touch $target/etc/fstab