[Fai-commit] r3779 - trunk/bin

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

Author: lange
Date: 2006-08-23 21:42:15 +0000 (Wed, 23 Aug 2006)
New Revision: 3779

Modified:
   trunk/bin/fai
Log:
minor changes, remove code using obsolete variable FAI_CVSROOT


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-08-23 21:00:42 UTC (rev 3778)
+++ trunk/bin/fai	2006-08-23 21:42:15 UTC (rev 3779)
@@ -37,8 +37,8 @@
 
 # the type of operating system (linux, sunos)
 oclass=$(uname -s | tr a-z A-Z)
-unset oclass
 faimond=0
+export renewclass=0
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 fai_init() {
 
@@ -120,7 +120,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 usage() {
     cat <<-EOF
-	fai $FAI_VERSION. Copyright (C) 1999-2005 Thomas Lange
+	fai $FAI_VERSION. Copyright (C) 1999-2006 Thomas Lange
 	Usage: $0 [options] [action]
        
 	Options:
@@ -144,7 +144,6 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main routine
 
-export renewclass=0
 # Parse commandline options
 TEMP=$(getopt -o Nhv --long new,help,verbose -n "$0" -- "$@")
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -159,7 +158,7 @@
             ;;
 	-v|--verbose)
 	    shift
-	    verbose=1
+	    export verbose=1
 	    ;;
 	-N|--new)
 	    shift
@@ -231,9 +230,6 @@
 
 task action 2>&1 | tee -a $LOGDIR/fai.log
 
-# not happy with this at all!
-[ "$FAI_CVSROOT" ] && rm -rf $FAI
-
 [ -L "$rundir/current_config" ] && rm -f "$rundir/current_config"
 
 echo "End of $0"