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

[Michael Tautschnig]

Author: mt
Date: 2009-04-16 20:55:38 +0000 (Thu, 16 Apr 2009)
New Revision: 5346

Added:
   people/michael/experimental/patches/bugfix-515704
Modified:
   people/michael/experimental/patches/series
Log:
added the patch supplied in #515704 to experimental


Added: people/michael/experimental/patches/bugfix-515704
===================================================================
--- people/michael/experimental/patches/bugfix-515704	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-515704	2009-04-16 20:55:38 UTC (rev 5346)
@@ -0,0 +1,34 @@
+2009-04-16  Michael Tautschnig  <mt at debian.org>
+
+	* fai-savelog: Fixed cd to wrong dir when $LOGREMOTEDIR was set (thanks Robin
+		Powell for the patch) (closes: #515704)
+Index: trunk/lib/fai-savelog
+===================================================================
+--- trunk.orig/lib/fai-savelog
++++ trunk/lib/fai-savelog	
+@@ -58,18 +58,21 @@
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ save_log_remote_shell() {
+ 
+-    local thislog
++    local thislogdir
+     if [ -n "$LOGREMOTEDIR" ];then
+-	thislog=$LOGREMOTEDIR/$HOSTNAME/$FAI_ACTION-$fai_rundate
++	thislog=$LOGREMOTEDIR/$HOSTNAME
+     else
+-	thislog=$HOSTNAME/$FAI_ACTION-$fai_rundate
++	thislog=$HOSTNAME
+     fi
+ 
++    local thislog
++    thislog=$thislogdir/$FAI_ACTION-$fai_rundate
++
+     echo "Save log files via $remotesh to $LOGUSER@$LOGSERVER:$thislog"
+     find $LOGDIR -size 0 -type f -exec rm {} \;
+     $remotesh -l $LOGUSER $LOGSERVER " \
+        mkdir -p $thislog ;\
+-       cd $HOSTNAME ;\
++       cd $thislogdir ;\
+        rm -f last-$FAI_ACTION ;\
+        ln -snf $FAI_ACTION-$fai_rundate last-$FAI_ACTION ;\
+        ln -snf $FAI_ACTION-$fai_rundate last"

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-16 20:53:11 UTC (rev 5345)
+++ people/michael/experimental/patches/series	2009-04-16 20:55:38 UTC (rev 5346)
@@ -15,3 +15,4 @@
 setup-storage_missing-raid-devs
 bugfix-504813
 bugfix-506463
+bugfix-515704