[Fai-commit] r3896 - trunk/lib

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

Author: lange
Date: 2006-09-08 10:03:16 +0000 (Fri, 08 Sep 2006)
New Revision: 3896

Modified:
   trunk/lib/subroutines
Log:
task_softupdates: copy disk_var.sh instead of redefining $diskvar,
task_savelog: fix in copy disk_var.sh


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-09-08 10:01:25 UTC (rev 3895)
+++ trunk/lib/subroutines	2006-09-08 10:03:16 UTC (rev 3896)
@@ -373,8 +373,8 @@
     [ -d $FAI_ROOT/var/lib/fai ] || mkdir -p $FAI_ROOT/var/lib/fai
     [ -d $FAI_ROOT/var/log/fai ] || mkdir -p $FAI_ROOT/var/log/fai
     fai-savelog -l
-    [ -f $LOGDIR/FAI_CLASSES ] && cp -p $LOGDIR/FAI_CLASSES $FAI_ROOT/var/lib/fai
-    [ "$diskvar" != "/var/log/fai/disk_var.sh" ] && cp -p $diskvar $FAI_ROOT/var/lib/fai
+    [ -f $LOGDIR/FAI_CLASSES ] && cp -pu $LOGDIR/FAI_CLASSES $FAI_ROOT/var/lib/fai
+    [ -f $LOGDIR/disk_var.sh ] && cp -pu $LOGDIR/disk_var.sh $FAI_ROOT/var/lib/fai
     fai-savelog -r
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -460,7 +460,7 @@
     local stamp=/var/run/fai/fai_softupdate_is_running
 
     > $stamp
-    diskvar=/var/log/fai/disk_var.sh
+    cp -p /var/lib/fai/disk_var.sh $LOGDIR # use the last disk_var during update
 
     save_dmesg