[Fai-commit] r5431 - in trunk: . debian lib

[Thomas Lange]

Author: lange
Date: 2009-07-18 18:29:16 +0000 (Sat, 18 Jul 2009)
New Revision: 5431

Modified:
   trunk/THANKS
   trunk/debian/changelog
   trunk/lib/fai-savelog
Log:
fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
Robin Powell for the patch (closes: #515704)

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2009-07-18 16:34:28 UTC (rev 5430)
+++ trunk/THANKS	2009-07-18 18:29:16 UTC (rev 5431)
@@ -38,6 +38,7 @@
 Ulrike Nitzsche		U.Nitzsche at ifw-dresden.de
 Raphaël Pinson		raphink at ubuntu.com
 Thomas Pöhnitzsch	thpo at foobar-cpa.de
+Robin Powell		rpowell at looksmart.net
 Michael Prokop		mika at grml.org
 Ake Sandgren		Ake.Sandgren at hpc2n.umu.se
 Michal Svamberg		svamberg at civ.zcu.cz

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-18 16:34:28 UTC (rev 5430)
+++ trunk/debian/changelog	2009-07-18 18:29:16 UTC (rev 5431)
@@ -15,8 +15,10 @@
     task_sysinfo, S99fai-setup/FAISERVER: Replaced all calls to ifconfig
     by proper ip + shell magic calls (closes: #524347). Thanks to Luk
     Claes for the patch
+  * fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
+    Robin Powell for the patch (closes: #515704)
   
- -- Thomas Lange <lange at debian.org>  Sat, 18 Jul 2009 18:26:02 +0200
+ -- Thomas Lange <lange at debian.org>  Sat, 18 Jul 2009 20:28:54 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/lib/fai-savelog
===================================================================
--- trunk/lib/fai-savelog	2009-07-18 16:34:28 UTC (rev 5430)
+++ trunk/lib/fai-savelog	2009-07-18 18:29:16 UTC (rev 5431)
@@ -58,18 +58,21 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 save_log_remote_shell() {
 
-    local thislog
+    local thislogdir
     if [ -n "$LOGREMOTEDIR" ];then
-	thislog=$LOGREMOTEDIR/$HOSTNAME/$FAI_ACTION-$fai_rundate
+	thislogdir=$LOGREMOTEDIR/$HOSTNAME/
     else
-	thislog=$HOSTNAME/$FAI_ACTION-$fai_rundate
+	thislogdir=$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"