[Fai-commit] r3335 - trunk/lib

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-03-28 14:16:28 +0000 (Tue, 28 Mar 2006)
New Revision: 3335

Modified:
   trunk/lib/subroutines
Log:
set $diskvar during softupdate to /var/log/fai/disk_var.sh,
task_savelog: test if files exist before copying them


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-03-28 14:09:52 UTC (rev 3334)
+++ trunk/lib/subroutines	2006-03-28 14:16:28 UTC (rev 3335)
@@ -374,9 +374,10 @@
 
     [ -d $target/var/log/fai ] || mkdir -p $target/var/log/fai
     [ -d $target/var/log/fai ] && fai-savelog -l
-    cd $LOGDIR && cp -p FAI_CLASSES variables.sh $diskvar $target/var/log/fai
+    [ -f $LOGDIR/FAI_CLASSES ] && cp -p $LOGDIR/FAI_CLASSES $target/var/log/fai
+    [ -f $LOGDIR/variables.sh ] && cp -p $LOGDIR/variables.sh $target/var/log/fai
+    [ "$diskvar" != "/var/log/fai/disk_var.sh" ] && cp -p $diskvar $target/var/log/fai
     fai-savelog -r
-    cd /
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_faiend() {
@@ -442,6 +443,7 @@
     local stamp=/var/run/fai/fai_softupdate_is_running
 
     > $stamp
+    diskvar=/var/log/disk_var.sh
 
     save_dmesg