[Fai-commit] r3881 - in trunk: bin lib

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

Author: lange
Date: 2006-09-06 21:50:07 +0000 (Wed, 06 Sep 2006)
New Revision: 3881

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/lib/subroutines
Log:
variables.sh is now variables.log


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-06 21:47:55 UTC (rev 3880)
+++ trunk/bin/make-fai-nfsroot	2006-09-06 21:50:07 UTC (rev 3881)
@@ -274,7 +274,7 @@
 	. /usr/lib/fai/subroutines
 	. /usr/lib/fai/subroutines-linux
 	set -a
-        . /tmp/fai/variables.sh 2>/dev/null
+        . /tmp/fai/variables.log 2>/dev/null
 EOF
 
     call_verbose call_with_stamp setup_ssh

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-09-06 21:47:55 UTC (rev 3880)
+++ trunk/lib/subroutines	2006-09-06 21:50:07 UTC (rev 3881)
@@ -347,8 +347,8 @@
 	rm $svar
     fi
     unset class svar
-    # now all variables are defined. Dump them to variables.sh
-    set | perl -ne 'print if /^\w\w+=/ and not /^(BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID|rootpw|ROOTPW|HOME|PWD)/' > $LOGDIR/variables.sh
+    # now all variables are defined. Dump them to variables.log
+    set | perl -ne 'print if /^\w\w+=/ and not /^(BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID|rootpw|ROOTPW|HOME|PWD)/' > $LOGDIR/variables.log
     cd /
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -373,7 +373,7 @@
     [ -d $FAI_ROOT/var/log/fai ] || mkdir -p $FAI_ROOT/var/log/fai
     [ -d $FAI_ROOT/var/log/fai ] && fai-savelog -l
     [ -f $LOGDIR/FAI_CLASSES ] && cp -p $LOGDIR/FAI_CLASSES $FAI_ROOT/var/log/fai
-    [ -f $LOGDIR/variables.sh ] && cp -p $LOGDIR/variables.sh $FAI_ROOT/var/log/fai
+    [ -f $LOGDIR/variables.log ] && cp -p $LOGDIR/variables.log $FAI_ROOT/var/log/fai
     [ "$diskvar" != "/var/log/fai/disk_var.sh" ] && cp -p $diskvar $FAI_ROOT/var/log/fai
     fai-savelog -r
 }