[Fai-commit] r4078 - trunk/lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-10-10 21:54:35 +0000 (Tue, 10 Oct 2006)
New Revision: 4078

Modified:
   trunk/lib/subroutines
Log:
move disk_var.sh from FAI 2.X installation to new location


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-10-10 21:51:40 UTC (rev 4077)
+++ trunk/lib/subroutines	2006-10-10 21:54:35 UTC (rev 4078)
@@ -491,6 +491,12 @@
 
     [ -f "$stamp" ] && die "Another fai softupdate is already running. Aborting."
     > $stamp
+    # if the system had been installed using fai < 3.0 disk_var.sh is found in /etc/fai
+    if [ ! -f /var/lib/fai/disk_var.sh -a -f /etc/fai/disk_var.sh ] ; then
+      mv /etc/fai/disk_var.sh /var/lib/fai/
+    fi
+    # the following copy operation is required to make $LOGDIR a reliable source
+    # for disk_var.sh
     cp -p /var/lib/fai/disk_var.sh $LOGDIR # use the last disk_var during update
 
     defnop wait_for_jobs