[Fai-commit] r5202 - people/michael/experimental/patches

[mt at alioth.debian.org]

Author: mt
Date: 2008-10-16 20:10:31 +0000 (Thu, 16 Oct 2008)
New Revision: 5202

Modified:
   people/michael/experimental/patches/logtail
Log:
save_dmesg is called multiple times, can't do the logtail stuff there, moved to
task_savelog instead


Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail	2008-10-16 18:19:01 UTC (rev 5201)
+++ people/michael/experimental/patches/logtail	2008-10-16 20:10:31 UTC (rev 5202)
@@ -33,18 +33,23 @@
 ===================================================================
 --- trunk.orig/lib/subroutines
 +++ trunk/lib/subroutines	
-@@ -82,8 +82,12 @@
+@@ -82,7 +82,6 @@
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  save_dmesg() {
 -
--    dmesg > $LOGDIR/dmesg.log
+     dmesg > $LOGDIR/dmesg.log
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+@@ -416,6 +415,11 @@
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ task_savelog() {
+ 
 +    if [ -r /var/run/fai/kern.log.offset ] ; then
 +      logtail -f /var/log/kern.log -o /var/run/fai/kern.log.offset > $LOGDIR/dmesg.log
 +      rm /var/run/fai/kern.log.offset
-+    else
-+      dmesg > $LOGDIR/dmesg.log
 +    fi
- }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- wait_for_jobs() {
++
+     mkdir -p $FAI_ROOT/var/lib/fai
+     mkdir -p $FAI_ROOT/var/log/fai
+     fai-savelog -l