[Fai-commit] r3848 - trunk/lib

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

Author: lange
Date: 2006-09-05 10:03:58 +0000 (Tue, 05 Sep 2006)
New Revision: 3848

Modified:
   trunk/lib/fai-savelog
   trunk/lib/fai-savelog-ftp
   trunk/lib/subroutines
Log:
rename internal variable $FAI_RUNDATE -> $fai_rundate


Modified: trunk/lib/fai-savelog
===================================================================
--- trunk/lib/fai-savelog	2006-09-05 09:50:03 UTC (rev 3847)
+++ trunk/lib/fai-savelog	2006-09-05 10:03:58 UTC (rev 3848)
@@ -35,26 +35,26 @@
     # save log files on local disk
 
     local logbase=$FAI_ROOT/var/log/fai
-    local thislog=$logbase/$HOSTNAME/$FAI_ACTION-$FAI_RUNDATE
+    local thislog=$logbase/$HOSTNAME/$FAI_ACTION-$fai_rundate
     find $LOGDIR -xdev -size 0 -type f -exec rm {} \;
     mkdir -p $thislog
     cp -a $LOGDIR/* $thislog
     ln -snf $HOSTNAME $logbase/localhost
-    ln -snf $FAI_ACTION-$FAI_RUNDATE $logbase/$HOSTNAME/last-$FAI_ACTION
-    ln -snf $FAI_ACTION-$FAI_RUNDATE $logbase/$HOSTNAME/last
+    ln -snf $FAI_ACTION-$fai_rundate $logbase/$HOSTNAME/last-$FAI_ACTION
+    ln -snf $FAI_ACTION-$fai_rundate $logbase/$HOSTNAME/last
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 save_log_remote_shell() {
 
-    echo "Save log files via $remotesh to $LOGUSER@$LOGSERVER:$HOSTNAME/$FAI_ACTION-$FAI_RUNDATE"
-    local thislog=$HOSTNAME/$FAI_ACTION-$FAI_RUNDATE
+    echo "Save log files via $remotesh to $LOGUSER@$LOGSERVER:$HOSTNAME/$FAI_ACTION-$fai_rundate"
+    local thislog=$HOSTNAME/$FAI_ACTION-$fai_rundate
     find $LOGDIR -size 0 -type f -exec rm {} \;
     $remotesh -l $LOGUSER $LOGSERVER " \
        mkdir -p $thislog ;\
        cd $HOSTNAME ;\
        rm -f last-$FAI_ACTION ;\
-       ln -snf $FAI_ACTION-$FAI_RUNDATE last-$FAI_ACTION ;\
-       ln -snf $FAI_ACTION-$FAI_RUNDATE last"
+       ln -snf $FAI_ACTION-$fai_rundate last-$FAI_ACTION ;\
+       ln -snf $FAI_ACTION-$fai_rundate last"
 
     $remotecp -pr $LOGDIR/* $LOGUSER@$LOGSERVER:$thislog
 }

Modified: trunk/lib/fai-savelog-ftp
===================================================================
--- trunk/lib/fai-savelog-ftp	2006-09-05 09:50:03 UTC (rev 3847)
+++ trunk/lib/fai-savelog-ftp	2006-09-05 10:03:58 UTC (rev 3848)
@@ -30,7 +30,7 @@
 
 chomp (my $hostname = `hostname`);
 
-print "Save log files via FTP to $ENV{LOGUSER}\@$ENV{LOGSERVER}:$hostname/$ENV{FAI_ACTION}-$ENV{FAI_RUNDATE}\n";
+print "Save log files via FTP to $ENV{LOGUSER}\@$ENV{LOGSERVER}:$hostname/$ENV{FAI_ACTION}-$ENV{fai_rundate}\n";
 
 my $ftp = Net::FTP->new("$ENV{LOGSERVER}", Debug => 0)
    or die "Cannot connect to FTP server $ENV{LOGSERVER}.\n";
@@ -38,8 +38,8 @@
    or die "Cannot login to FTP server $ENV{LOGSERVER} with login $ENV{LOGUSER}.\n";
 $ftp->cwd("$ENV{LOGREMOTEDIR}")
    or die "Cannot change work directory to $ENV{LOGREMOTEDIR}\n";
-my $ftplogdir = $ftp->mkdir("$hostname/$ENV{FAI_ACTION}-$ENV{FAI_RUNDATE}", 1) 
-   or die "Cannot create dir $ENV{FAI_ACTION}-$ENV{FAI_RUNDATE}.\n";
+my $ftplogdir = $ftp->mkdir("$hostname/$ENV{FAI_ACTION}-$ENV{fai_rundate}", 1) 
+   or die "Cannot create dir $ENV{FAI_ACTION}-$ENV{fai_rundate}.\n";
 $ftp->cwd("$ftplogdir")
    or die "Cannot change work directory to $ftplogdir.\n";
 

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-09-05 09:50:03 UTC (rev 3847)
+++ trunk/lib/subroutines	2006-09-05 10:03:58 UTC (rev 3848)
@@ -188,7 +188,7 @@
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO
-# Provides-Var:    $FAI_RUNDATE
+# Provides-Var:    $fai_rundate
 # Requires-Var:    $DOMAIN $do_init_tasks
 # Suggests-Var:    $flag_createvt $flag_sshd
 # Short-Description: <task desc.>
@@ -219,7 +219,7 @@
     unset flag_createvt flag_sshd
 
     # when did FAI start, using localtime
-    FAI_RUNDATE=$(date +'%Y%m%d_%H%M%S')
+    fai_rundate=$(date +'%Y%m%d_%H%M%S')
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO